version 1.62, 2007/04/05 10:29:58
|
version 1.77, 2009/11/23 12:05:36
|
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 53 sub start_matchresponse {
|
Line 54 sub start_matchresponse {
|
$result=&Apache::response::meta_package_write('matchresponse'); |
$result=&Apache::response::meta_package_write('matchresponse'); |
} elsif ($target eq 'edit' ) { |
} elsif ($target eq 'edit' ) { |
$result.=&Apache::edit::start_table($token). |
$result.=&Apache::edit::start_table($token). |
'<tr><td>'.&Apache::lonxml::description($token)."</td><td>Delete:". |
'<tr><td>'.&Apache::lonxml::description($token).'</td>' |
&Apache::edit::deletelist($target,$token) |
.'<td><span class="LC_nobreak">'.&mt('Delete?').' ' |
."</td><td> ".&Apache::edit::end_row() |
.&Apache::edit::deletelist($target,$token) |
.&Apache::edit::start_spanning_row(); |
.'</span></td>' |
|
.'<td> '.&Apache::edit::end_row() |
|
.&Apache::edit::start_spanning_row(); |
|
|
$result.= |
$result.= |
&Apache::edit::text_arg('Max Number Of Shown Foils:','max',$token,'4'). |
&Apache::edit::text_arg('Max Number Of Shown Foils:','max',$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::end_row().&Apache::edit::start_spanning_row()."\n"; |
&Apache::edit::end_row().&Apache::edit::start_spanning_row()."\n"; |
} elsif ($target eq 'modified') { |
} elsif ($target eq 'modified') { |
Line 70 sub start_matchresponse {
|
Line 73 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"} }, |
|
1); |
} |
} |
return $result; |
return $result; |
} |
} |
Line 97 sub start_itemgroup {
|
Line 103 sub start_itemgroup {
|
if ($target eq 'edit') { |
if ($target eq 'edit') { |
$result=&Apache::edit::tag_start($target,$token); |
$result=&Apache::edit::tag_start($target,$token); |
$result.=&Apache::edit::select_arg('Randomize Order:','randomize', |
$result.=&Apache::edit::select_arg('Randomize Order:','randomize', |
['yes','no'],$token); |
['yes','no'],$token).' 'x 3; |
$result.=&Apache::edit::select_arg('Items Display Location:', |
$result.=&Apache::edit::select_arg('Items Display Location:', |
'location', |
'location', |
['top','bottom','left','right'], |
['top','bottom','left','right'], |
$token); |
$token).' 'x 3; |
$result.=&Apache::edit::select_arg('Items Display Directection:', |
$result.=&Apache::edit::select_arg('Items Display Direction:', |
'direction', |
'direction', |
['vertical','horizontal'], |
['vertical','horizontal'], |
$token); |
$token); |
Line 174 sub end_itemgroup {
|
Line 180 sub end_itemgroup {
|
$i++; |
$i++; |
} |
} |
$table.=' \end{description} \strut '; |
$table.=' \end{description} \strut '; |
if ($Apache::lonhomework::type eq 'exam') {$table.='\vskip -13 mm \strut ';} |
if ($Apache::lonhomework::type eq 'exam') {$table.='\vskip -13 mm \strut ';} |
$Apache::matchresponse::itemtable{'display'}=$table; |
$Apache::matchresponse::itemtable{'display'}=$table; |
$Apache::lonxml::post_evaluate=0; |
$Apache::lonxml::post_evaluate=0; |
} |
} |
Line 192 sub start_item {
|
Line 198 sub start_item {
|
$result=&Apache::edit::tag_start($target,$token,"Item"); |
$result=&Apache::edit::tag_start($target,$token,"Item"); |
$result.=&Apache::edit::text_arg('Name:','name',$token); |
$result.=&Apache::edit::text_arg('Name:','name',$token); |
if ($randomize ne 'no') { |
if ($randomize ne 'no') { |
$result.=&Apache::edit::select_arg('Location:','location', |
$result.=' 'x 3 . |
|
&Apache::edit::select_arg('Location:','location', |
['random','top','bottom'], |
['random','top','bottom'], |
$token); |
$token); |
} |
} |
Line 248 sub start_foilgroup {
|
Line 255 sub start_foilgroup {
|
&Apache::response::pushrandomnumber(); |
&Apache::response::pushrandomnumber(); |
if ($target eq 'edit') { |
if ($target eq 'edit') { |
$result.=&Apache::edit::start_table($token) |
$result.=&Apache::edit::start_table($token) |
."<tr><td>Collection Of Foils</td><td>Delete:" |
.'<tr><td>'.&mt('Collection Of Foils').'</td>' |
|
.'<td><span class="LC_nobreak">'.&mt('Delete?') |
.&Apache::edit::deletelist($target,$token) |
.&Apache::edit::deletelist($target,$token) |
."</td><td> ".&Apache::edit::end_row() |
.'</span></td>' |
|
.'<td> '.&Apache::edit::end_row() |
.&Apache::edit::start_spanning_row()."\n"; |
.&Apache::edit::start_spanning_row()."\n"; |
} |
} |
return $result; |
return $result; |
Line 259 sub start_foilgroup {
|
Line 268 sub start_foilgroup {
|
sub end_foilgroup { |
sub end_foilgroup { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $result; |
my $result; |
|
my $part = $Apache::inputtags::part; |
|
my $response_id = $Apache::inputtags::response[-1]; |
|
|
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex' || $target eq 'analyze') { |
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex' || $target eq 'analyze') { |
my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2'); |
my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2'); |
my $randomize = &Apache::lonxml::get_param('randomize',$parstack, |
my $randomize = &Apache::lonxml::get_param('randomize',$parstack, |
Line 276 sub end_foilgroup {
|
Line 288 sub end_foilgroup {
|
['text','value','location']); |
['text','value','location']); |
#FIXME need to store options in some way |
#FIXME need to store options in some way |
} |
} |
&Apache::lonxml::increment_counter(&getfoilcounts($max)); |
&Apache::lonxml::increment_counter(&getfoilcounts($max), |
|
"$part.$response_id"); |
|
if ($target eq 'analyze') { |
|
&Apache::lonhomework::set_bubble_lines(); |
|
} |
|
|
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result=&Apache::edit::end_table(); |
$result=&Apache::edit::end_table(); |
} |
} |
Line 415 sub grade_response {
|
Line 432 sub grade_response {
|
} |
} |
} |
} |
|
|
|
sub format_prior_answer { |
|
my ($mode,$answer,$other_data) = @_; |
|
my %answer =&Apache::lonnet::str2hash($answer); |
|
my $foil_order =$other_data->[0]; |
|
my %grading =&Apache::lonnet::str2hash($other_data->[1]); |
|
my @items =&Apache::lonnet::str2array($other_data->[2]); |
|
my $output; |
|
|
|
foreach my $name (@{ $foil_order }) { |
|
my $item=shift(@items); |
|
$output .= '<tr><td>'.$item.'</td></tr>'; |
|
} |
|
return if (!defined($output)); |
|
|
|
$output = '<table class="LC_prior_match">'.$output.'</table>'; |
|
return $output; |
|
} |
|
|
sub itemdisplay { |
sub itemdisplay { |
my ($location)=@_; |
my ($location)=@_; |
if ($location eq 'top' && |
if ($location eq 'top' && |
Line 426 sub itemdisplay {
|
Line 461 sub itemdisplay {
|
} |
} |
return undef; |
return undef; |
} |
} |
|
|
sub displayfoils { |
sub displayfoils { |
my ($target,$max,$randomize)=@_; |
my ($target,$max,$randomize)=@_; |
my ($tabsize, $lefttabsize, $righttabsize); |
my ($tabsize, $lefttabsize, $righttabsize); |
Line 477 sub displayfoils {
|
Line 513 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' |
} |
&& $Apache::inputtags::status['-1'] eq 'CAN_ANSWER') { |
|
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 { |
|
&Apache::lonnet::logthis("Exam2"); |
|
|
|
$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' |
|
&& $Apache::inputtags::status['-1'] eq 'CAN_ANSWER') { |
|
$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' |
|
&& $Apache::inputtags::status['-1'] eq 'CAN_ANSWER') { |
|
$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 521 sub displayfoils {
|
Line 575 sub displayfoils {
|
$question.="<br />\n".$text; |
$question.="<br />\n".$text; |
} |
} |
if ($Apache::lonhomework::type eq 'exam') { |
if ($Apache::lonhomework::type eq 'exam') { |
|
&Apache::lonnet::logthis('webbubbles'); |
my @blank; |
my @blank; |
$question.=&Apache::optionresponse::webbubbles(\@used_letters,\@blank,$temp,$last_letter); |
$question.=&Apache::optionresponse::webbubbles(\@used_letters,\@blank,$temp,$last_letter); |
} |
} |
Line 528 sub displayfoils {
|
Line 583 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') { |
|
&Apache::lonnet::logthis('exam3'); |
$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, ' ';} |
$question.='\vskip -1 mm\noindent\begin{list}{}{\setlength{\listparindent}{0mm}\setlength{\leftmargin}{2mm}}' |
$question.='\vskip -1 mm\noindent\begin{list}{}{\setlength{\listparindent}{0mm}\setlength{\leftmargin}{2mm}}' |
.'\item \hskip -3mm \textbf{'.$internal_counter.'}'; |
.'\item \hskip -3mm \textbf{'.$internal_counter.'}'; |
if (&itemdisplay('left') || &itemdisplay('right')) { |
if (&itemdisplay('left') || &itemdisplay('right')) { |
&Apache::lonnet::logthis("Constraining bubbles to $righttabsize - 10"); |
$question .= '\vskip -4 mm' . &Apache::optionresponse::bubbles(\@used_letters,\@emptyItems, "", $righttabsize); |
$question .= &Apache::optionresponse::bubbles(\@used_letters,\@emptyItems, "", $righttabsize); |
|
} |
} |
else { |
else { |
&Apache::lonnet::logthis("Not constraining bubbles"); |
$question .= '\vskip -4 mm' . &Apache::optionresponse::bubbles(\@used_letters,\@emptyItems); |
$question .= &Apache::optionresponse::bubbles(\@used_letters,\@emptyItems); |
|
} |
} |
$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"; |
&Apache::lonnet::logthis("Exam4"); |
|
if($env{'form.pdfFormFields'} eq 'yes' |
|
&& $Apache::inputtags::status['-1'] eq 'CAN_ANSWER') { |
|
$question .= " $optionlist ". &Apache::lonxml::print_pdf_end_combobox($text).'\strut'; |
|
} else { |
|
$question.=' '.$optionlist.$text.'\strut\\\\\strut '."\n"; |
|
} |
} |
} |
} |
} |
$temp++; |
$temp++; |
Line 578 sub displayfoils {
|
Line 638 sub displayfoils {
|
$result='\setlength{\tabcolsep}{1 mm}\begin{tabular}{p{'.$lefttabsize.'}p{'.$righttabsize.'}}\begin{minipage}{'.$lefttabsize.'}'.$result.'\end{minipage}&\begin{minipage}{'.$righttabsize.'}'.$question.'\end{minipage}\end{tabular}'; |
$result='\setlength{\tabcolsep}{1 mm}\begin{tabular}{p{'.$lefttabsize.'}p{'.$righttabsize.'}}\begin{minipage}{'.$lefttabsize.'}'.$result.'\end{minipage}&\begin{minipage}{'.$righttabsize.'}'.$question.'\end{minipage}\end{tabular}'; |
} |
} |
} |
} |
|
if ($target eq 'web') { |
|
&Apache::response::setup_prior_tries_hash(\&format_prior_answer, |
|
[\@whichfoils, |
|
'submissiongrading', |
|
'submissionitems']); |
|
} |
if ($target ne 'tex') {$result.="<br />";} else {$result.=' \\\\ ';} |
if ($target ne 'tex') {$result.="<br />";} else {$result.=' \\\\ ';} |
return $result; |
return $result; |
} |
} |
Line 678 sub end_foil {
|
Line 744 sub end_foil {
|
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 'tex' || $target eq 'analyze') { |
if ($target eq 'tex' && $Apache::lonhomework::type eq 'exam') { |
if ($target eq 'tex' && $Apache::lonhomework::type eq 'exam') { |
|
&Apache::lonnet::logthis('triangleright'); |
$text='\vskip 5mm $\triangleright$ '.$text; |
$text='\vskip 5mm $\triangleright$ '.$text; |
} |
} |
my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval); |
my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval); |
Line 685 sub end_foil {
|
Line 752 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, |
$safeeval); |
$safeeval); |
if ( $Apache::matchresponse::conceptgroup |
if ( $Apache::matchresponse::conceptgroup |
&& !&Apache::response::showallfoils() ) { |
&& !&Apache::response::showallfoils() ) { |
|
&Apache::lonnet::logthis("pushing conceptgroup"); |
|
|
push @{ $Apache::response::conceptgroup{'names'} }, $name; |
push @{ $Apache::response::conceptgroup{'names'} }, $name; |
$Apache::response::conceptgroup{"$name.value"} = $value; |
$Apache::response::conceptgroup{"$name.value"} = $value; |
$Apache::response::conceptgroup{"$name.text"} = $text; |
$Apache::response::conceptgroup{"$name.text"} = $text; |
$Apache::response::conceptgroup{"$name.location"} = $location; |
$Apache::response::conceptgroup{"$name.location"} = $location; |
} else { |
} else { |
|
&Apache::lonnet::logthis("pushing foilgroup."); |
|
|
push @{ $Apache::response::foilgroup{'names'} }, $name; |
push @{ $Apache::response::foilgroup{'names'} }, $name; |
$Apache::response::foilgroup{"$name.value"} = $value; |
$Apache::response::foilgroup{"$name.value"} = $value; |
$Apache::response::foilgroup{"$name.text"} = $text; |
$Apache::response::foilgroup{"$name.text"} = $text; |