version 1.103, 2005/06/27 21:51:29
|
version 1.112, 2007/03/01 02:31:20
|
Line 179 sub end_foilgroup {
|
Line 179 sub end_foilgroup {
|
$safeeval,'-2'); |
$safeeval,'-2'); |
if ( $style eq 'survey' && $target ne 'analyze') { |
if ( $style eq 'survey' && $target ne 'analyze') { |
if ($target eq 'web' || $target eq 'tex') { |
if ($target eq 'web' || $target eq 'tex') { |
$result=&displayallfoils($direction); |
$result=&displayallfoils($direction, $target); |
|
if ($target eq 'web') { |
|
&setup_prior_tries_hash(); |
|
} |
} elsif ( $target eq 'answer' ) { |
} elsif ( $target eq 'answer' ) { |
$result=&displayallanswers(); |
$result=&displayallanswers(); |
} elsif ( $target eq 'grade' ) { |
} elsif ( $target eq 'grade' ) { |
Line 193 sub end_foilgroup {
|
Line 196 sub end_foilgroup {
|
$safeeval,'-2'); |
$safeeval,'-2'); |
if ($target eq 'web' || $target eq 'tex') { |
if ($target eq 'web' || $target eq 'tex') { |
$result=&displayfoils($target,$max,$randomize,$direction); |
$result=&displayfoils($target,$max,$randomize,$direction); |
|
if ($target eq 'web') { |
|
&setup_prior_tries_hash(); |
|
} |
} elsif ($target eq 'answer' ) { |
} elsif ($target eq 'answer' ) { |
$result=&displayanswers($max,$randomize); |
$result=&displayanswers($max,$randomize); |
} elsif ( $target eq 'grade') { |
} elsif ( $target eq 'grade') { |
Line 206 sub end_foilgroup {
|
Line 212 sub end_foilgroup {
|
('true','false')); |
('true','false')); |
} |
} |
} |
} |
|
$Apache::lonxml::post_evaluate=0; |
} |
} |
&Apache::response::poprandomnumber(); |
&Apache::response::poprandomnumber(); |
&Apache::lonxml::increment_counter(); |
&Apache::lonxml::increment_counter(); |
Line 230 sub getfoilcounts {
|
Line 237 sub getfoilcounts {
|
return ($truecnt,$falsecnt); |
return ($truecnt,$falsecnt); |
} |
} |
|
|
|
sub setup_prior_tries_hash { |
|
my $part=$Apache::inputtags::part; |
|
my $id=$Apache::inputtags::response[-1]; |
|
foreach my $i (1..$Apache::lonhomework::history{'version'}) { |
|
my $key = "$i:resource.$part.$id.submission"; |
|
next if (!exists($Apache::lonhomework::history{"$key"})); |
|
my %response = |
|
&Apache::lonnet::str2hash($Apache::lonhomework::history{$key}); |
|
my ($name) = keys(%response); |
|
$Apache::inputtags::submission_display{$key} = |
|
$Apache::response::foilgroup{$name.'.text'} |
|
} |
|
} |
|
|
sub displayallfoils { |
sub displayallfoils { |
my ($direction)=@_; |
my ($direction, $target)=@_; |
my $result; |
my $result; |
&Apache::lonxml::debug("survey style display"); |
&Apache::lonxml::debug("survey style display"); |
my @names = @{ $Apache::response::foilgroup{'names'} }; |
my @names; |
|
if ( $Apache::response::foilgroup{'names'} ) { |
|
@names= @{ $Apache::response::foilgroup{'names'} }; |
|
} |
my $temp=0; |
my $temp=0; |
|
my $i =0; |
my $id=$Apache::inputtags::response['-1']; |
my $id=$Apache::inputtags::response['-1']; |
my $part=$Apache::inputtags::part; |
my $part=$Apache::inputtags::part; |
my $lastresponse= |
my $lastresponse= |
Line 245 sub displayallfoils {
|
Line 270 sub displayallfoils {
|
if (&Apache::response::show_answer() ) { |
if (&Apache::response::show_answer() ) { |
foreach my $name (@names) { |
foreach my $name (@names) { |
if ($Apache::response::foilgroup{$name.'.value'} ne 'unused') { |
if ($Apache::response::foilgroup{$name.'.value'} ne 'unused') { |
if ($direction eq 'horizontal') { |
if (($direction eq 'horizontal') && ($target ne 'tex')) { |
$result.="<td>"; |
$result.="<td>"; |
} else { |
} else { |
$result.="<br />"; |
if ($target eq 'tex') { |
|
$result .= '\item \vskip -2mm '; |
|
} else { |
|
$result.="<br />"; |
|
} |
} |
} |
if (defined($lastresponse{$name})) { |
if (defined($lastresponse{$name})) { |
$result.='<b>'; |
if ($target eq 'tex') { |
|
$result .= '}'; |
|
} else { |
|
$result.='<b>'; |
|
} |
} |
} |
$result .= $Apache::response::foilgroup{$name.'.text'}; |
$result .= $Apache::response::foilgroup{$name.'.text'}; |
if (defined($lastresponse{$name})) { |
if (defined($lastresponse{$name}) && ($target ne 'tex')) { |
$result.='</b>'; |
$result.='</b>'; |
} |
} |
if ($direction eq 'horizontal') { $result.="</td>"; } |
if (($direction eq 'horizontal') && ($target ne 'tex')) { $result.="</td>"; } |
} |
} |
} |
} |
} else { |
} else { |
Line 266 sub displayallfoils {
|
Line 299 sub displayallfoils {
|
if ($direction eq 'horizontal') { |
if ($direction eq 'horizontal') { |
$result.="<td>"; |
$result.="<td>"; |
} else { |
} else { |
$result.="<br />"; |
if ($target eq 'tex') { |
|
$result .= '\item \vskip -2mm '; |
|
} else { |
|
$result.="<br />"; |
|
} |
|
} |
|
if ($target eq 'tex') { |
|
$result .= '$\bigcirc$'.$Apache::response::foilgroup{$name.'.text'}.'\\\\'; #' stupid emacs |
|
$i++; |
|
} else { |
|
$result .= '<label>'; |
|
$result.="<input type=\"radio\" name=\"HWVAL_$Apache::inputtags::response['-1']\" value=\"$temp\" "; |
|
if (defined($lastresponse{$name})) { $result .= 'checked="on"'; } |
|
$result .= ' />'.$Apache::response::foilgroup{$name.'.text'}. |
|
'</label>'; |
} |
} |
$result .= '<label>'; |
|
$result.="<input type=\"radio\" name=\"HWVAL_$Apache::inputtags::response['-1']\" value=\"$temp\" "; |
|
if (defined($lastresponse{$name})) { $result .= 'checked="on"'; } |
|
$result .= '>'.$Apache::response::foilgroup{$name.'.text'}. |
|
'</label>'; |
|
$temp++; |
$temp++; |
if ($direction eq 'horizontal') { $result.="</td>"; } |
if ($target ne 'tex') { |
|
if (($direction eq 'horizontal') && ($target ne 'tex')) { $result.="</td>"; } |
|
} else { |
|
$result.='\vskip 0 mm '; |
|
} |
} |
} |
} |
} |
} |
} |
if ($direction eq 'horizontal') { $result.='</tr></table>'; } |
if (($direction eq 'horizontal') && ($target ne 'tex')) { $result.='</tr></table>'; } |
return $result; |
return $result; |
} |
} |
|
|
Line 291 sub whichfoils {
|
Line 337 sub whichfoils {
|
my ($truecnt,$falsecnt) = &getfoilcounts(); |
my ($truecnt,$falsecnt) = &getfoilcounts(); |
my $count=0; |
my $count=0; |
# we will add in 1 of the true statements |
# we will add in 1 of the true statements |
if (($falsecnt+1)>$max) { $count=$max } else { $count=$falsecnt+1; } |
if ( $max>0 && ($falsecnt+1)>$max) { $count=$max } else { $count=$falsecnt+1; $max=$count; } |
my $answer=int(&Math::Random::random_uniform() * ($count)); |
my $answer=int(&Math::Random::random_uniform() * ($count)); |
&Apache::lonxml::debug("Count is $count, $answer is $answer"); |
&Apache::lonxml::debug("Count is $count, $answer is $answer"); |
my @names; |
my @names; |
Line 484 sub displayfoils {
|
Line 530 sub displayfoils {
|
$result.= '<label>'; |
$result.= '<label>'; |
$result.="<input type=\"radio\" name=\"HWVAL_$Apache::inputtags::response['-1']\" value=\"$temp\" "; |
$result.="<input type=\"radio\" name=\"HWVAL_$Apache::inputtags::response['-1']\" value=\"$temp\" "; |
if (defined($lastresponse{$name})) { $result .= 'checked="on"'; } |
if (defined($lastresponse{$name})) { $result .= 'checked="on"'; } |
$result .= '>'.$Apache::response::foilgroup{$name.'.text'}."</label>"; |
$result .= ' />'.$Apache::response::foilgroup{$name.'.text'}."</label>"; |
} else { |
} else { |
if ($Apache::lonhomework::type eq 'exam') { |
if ($Apache::lonhomework::type eq 'exam') { |
$result .= '{\small \textbf{'.$alphabet[$i].'}}$\bigcirc$'.$Apache::response::foilgroup{$name.'.text'}.'\\\\'; #' stupid emacs |
$result .= '{\small \textbf{'.$alphabet[$i].'}}$\bigcirc$'.$Apache::response::foilgroup{$name.'.text'}.'\\\\'; #' stupid emacs |
Line 507 sub displayfoils {
|
Line 553 sub displayfoils {
|
} |
} |
|
|
sub displayallanswers { |
sub displayallanswers { |
my @names = @{ $Apache::response::foilgroup{'names'} }; |
my @names; |
|
if ( $Apache::response::foilgroup{'names'} ) { |
|
@names= @{ $Apache::response::foilgroup{'names'} }; |
|
} |
|
|
my $result=&Apache::response::answer_header('radiobuttonresponse'); |
my $result=&Apache::response::answer_header('radiobuttonresponse'); |
foreach my $name (@names) { |
foreach my $name (@names) { |
Line 522 sub displayanswers {
|
Line 571 sub displayanswers {
|
my ($max,$randomize)=@_; |
my ($max,$randomize)=@_; |
my ($answer,@whichopt) = &whichfoils($max,$randomize); |
my ($answer,@whichopt) = &whichfoils($max,$randomize); |
my $result=&Apache::response::answer_header('radiobuttonresponse'); |
my $result=&Apache::response::answer_header('radiobuttonresponse'); |
|
if ($Apache::lonhomework::type eq 'exam') { |
|
my $correct = ('A'..'Z')[$answer]; |
|
$result.=&Apache::response::answer_part('radiobuttonresponse', |
|
$correct); |
|
} |
foreach my $name (@whichopt) { |
foreach my $name (@whichopt) { |
$result.=&Apache::response::answer_part('radiobuttonresponse', |
$result.=&Apache::response::answer_part('radiobuttonresponse', |
$Apache::response::foilgroup{$name.'.value'}) |
$Apache::response::foilgroup{$name.'.value'}); |
} |
} |
$result.=&Apache::response::answer_footer('radiobuttonresponse'); |
$result.=&Apache::response::answer_footer('radiobuttonresponse'); |
return $result; |
return $result; |
} |
} |