version 1.61, 2007/03/27 19:20:49
|
version 1.70, 2008/08/08 16:37:13
|
Line 70 sub start_matchresponse {
|
Line 70 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 259 sub start_foilgroup {
|
Line 262 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 282 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 426 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 455 sub itemdisplay {
|
} |
} |
return undef; |
return undef; |
} |
} |
|
|
sub displayfoils { |
sub displayfoils { |
my ($target,$max,$randomize)=@_; |
my ($target,$max,$randomize)=@_; |
|
my ($tabsize, $lefttabsize, $righttabsize); |
|
|
my $result; |
my $result; |
my $question; |
my $question; |
my (@whichfoils)=&Apache::response::whichorder(&getfoilcounts($max), |
my (@whichfoils)=&Apache::response::whichorder(&getfoilcounts($max), |
Line 493 sub displayfoils {
|
Line 525 sub displayfoils {
|
$optionlist."</select>\n"; |
$optionlist."</select>\n"; |
} |
} |
my $text=$Apache::response::foilgroup{$name.'.text'}; |
my $text=$Apache::response::foilgroup{$name.'.text'}; |
|
# |
|
# Factor out the tex computations of the left/right 1/2 minipage |
|
# widths for left or right positioning. This allows us |
|
# to, if necessary constrain the bubble widths: |
|
# |
|
if ($target eq 'tex' && |
|
(&itemdisplay('left') || &itemdisplay('right'))) { |
|
$tabsize=&Apache::londefdef::recalc($env{'form.textwidth'}); |
|
($lefttabsize,$righttabsize)=(0,0); |
|
if ($Apache::matchresponse::TeXitemgroupwidth ne '') { |
|
$Apache::matchresponse::TeXitemgroupwidth=~/(\d*.?\d*)/; |
|
$lefttabsize=$tabsize*$1/100; |
|
$righttabsize=0.95*($tabsize-$lefttabsize); |
|
} else { |
|
$tabsize=~/(\d+\.?\d*)/; |
|
$lefttabsize=$1/2.1; |
|
$righttabsize=0.95*($1-$lefttabsize); |
|
} |
|
} |
if ($target ne 'tex') { |
if ($target ne 'tex') { |
if ($Apache::lonhomework::type ne 'exam') { |
if ($Apache::lonhomework::type ne 'exam') { |
$question.="<br />\n".$optionlist.$text; |
$question.="<br />\n".$optionlist.$text; |
Line 504 sub displayfoils {
|
Line 555 sub displayfoils {
|
$question.=&Apache::optionresponse::webbubbles(\@used_letters,\@blank,$temp,$last_letter); |
$question.=&Apache::optionresponse::webbubbles(\@used_letters,\@blank,$temp,$last_letter); |
} |
} |
} else { |
} else { |
|
# Note that if left or right positioned, we must |
|
# confine the bubbles to righttabsize: |
|
# |
if ($Apache::lonhomework::type eq 'exam') { |
if ($Apache::lonhomework::type eq 'exam') { |
$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{enumerate}\item[\textbf{'.$internal_counter.'}.]'.&Apache::optionresponse::bubbles(\@used_letters,\@emptyItems).'\end{enumerate} \vskip -8 mm \strut '; |
$question.='\vskip -1 mm\noindent\begin{list}{}{\setlength{\listparindent}{0mm}\setlength{\leftmargin}{2mm}}' |
|
.'\item \hskip -3mm \textbf{'.$internal_counter.'}'; |
|
if (&itemdisplay('left') || &itemdisplay('right')) { |
|
$question .= &Apache::optionresponse::bubbles(\@used_letters,\@emptyItems, "", $righttabsize); |
|
} |
|
else { |
|
$question .= &Apache::optionresponse::bubbles(\@used_letters,\@emptyItems); |
|
} |
|
$question .= '\end{list} \vskip -8 mm \strut '; |
$internal_counter++; |
$internal_counter++; |
} else { |
} else { |
$question.=' '.$optionlist.$text.'\strut\\\\\strut '."\n"; |
$question.=' '.$optionlist.$text.'\strut\\\\\strut '."\n"; |
Line 528 sub displayfoils {
|
Line 590 sub displayfoils {
|
$result='<table><tr><td valign="top">'.$question. |
$result='<table><tr><td valign="top">'.$question. |
'</td><td valign="top">'.$result.'</td></tr></table>'; |
'</td><td valign="top">'.$result.'</td></tr></table>'; |
} else { |
} else { |
my $tabsize=&Apache::londefdef::recalc($env{'form.textwidth'}); |
|
my ($lefttabsize,$righttabsize)=(0,0); |
|
if ($Apache::matchresponse::TeXitemgroupwidth ne '') { |
|
$Apache::matchresponse::TeXitemgroupwidth=~/(\d*.?\d*)/; |
|
$lefttabsize=$tabsize*$1/100; |
|
$righttabsize=0.95*($tabsize-$lefttabsize); |
|
} else { |
|
$tabsize=~/(\d+\.?\d*)/; |
|
$lefttabsize=$1/2.1; |
|
$righttabsize=0.95*($1-$lefttabsize); |
|
} |
|
$lefttabsize.=' mm '; |
$lefttabsize.=' mm '; |
$righttabsize.=' mm '; |
$righttabsize.=' mm '; |
$result='\setlength{\tabcolsep}{1 mm}\begin{tabular}{p{'.$righttabsize.'}p{'.$lefttabsize.'}}\begin{minipage}{'.$righttabsize.'}'.$question.'\end{minipage}&\begin{minipage}{'.$lefttabsize.'}'.$result.'\end{minipage}\end{tabular}'; |
$result='\setlength{\tabcolsep}{1 mm}\begin{tabular}{p{'.$righttabsize.'}p{'.$lefttabsize.'}}\begin{minipage}{'.$righttabsize.'}'.$question.'\end{minipage}&\begin{minipage}{'.$lefttabsize.'}'.$result.'\end{minipage}\end{tabular}'; |
Line 550 sub displayfoils {
|
Line 601 sub displayfoils {
|
$result='<table><tr><td valign="top">'.$result. |
$result='<table><tr><td valign="top">'.$result. |
'</td><td valign="top">'.$question.'</td></tr></table>'; |
'</td><td valign="top">'.$question.'</td></tr></table>'; |
} else { |
} else { |
my $tabsize=&Apache::londefdef::recalc($env{'form.textwidth'}); |
|
my ($lefttabsize,$righttabsize)=(0,0); |
|
if ($Apache::matchresponse::TeXitemgroupwidth ne '') { |
|
$Apache::matchresponse::TeXitemgroupwidth=~/(\d*.?\d*)/; |
|
$lefttabsize=$tabsize*$1/100; |
|
$righttabsize=0.95*($tabsize-$lefttabsize); |
|
} else { |
|
$tabsize=~/(\d+\.?\d*)/; |
|
$lefttabsize=$1/2.1; |
|
$righttabsize=0.95*($1-$lefttabsize); |
|
} |
|
$lefttabsize.=' mm '; |
$lefttabsize.=' mm '; |
$righttabsize.=' mm '; |
$righttabsize.=' mm '; |
$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 673 sub end_foil {
|
Line 719 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, |