version 1.71, 2003/03/27 14:58:56
|
version 1.86, 2003/09/22 20:49:01
|
Line 152 sub end_foilgroup {
|
Line 152 sub end_foilgroup {
|
|
|
my $result; |
my $result; |
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 $tex_option_switch=&Apache::lonxml::get_param('texoptions',$parstack,$safeeval); |
my $name; |
my $name; |
my @opt; |
my @opt; |
eval '@opt ='.&Apache::lonxml::get_param('options',$parstack,$safeeval); |
eval '@opt ='.&Apache::lonxml::get_param('options',$parstack,$safeeval); |
|
if ($target eq 'tex' && $tex_option_switch eq 'nochoice') {@opt=();} |
&Apache::lonxml::debug("Options are $#opt"); |
&Apache::lonxml::debug("Options are $#opt"); |
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 185 sub end_foilgroup {
|
Line 187 sub end_foilgroup {
|
my $wrong=0; |
my $wrong=0; |
my $ignored=0; |
my $ignored=0; |
foreach $name (@whichopt) { |
foreach $name (@whichopt) { |
my $response = $ENV{'form.HWVAL_'.$Apache::inputtags::response['-1'].":$temp"}; |
my $response=&Apache::response::getresponse($temp); |
|
if ($ENV{'form.submitted'} eq 'scantron') { |
|
$response = $opt[$response]; |
|
} |
$responsehash{$name}=$response; |
$responsehash{$name}=$response; |
if ( $response =~ /[^\s]/) { |
if ( $response =~ /[^\s]/) { |
my $value=$Apache::response::foilgroup{$name.'.value'}; |
my $value=$Apache::response::foilgroup{$name.'.value'}; |
Line 207 sub end_foilgroup {
|
Line 212 sub end_foilgroup {
|
my %previous=&Apache::response::check_for_previous($responsestr, |
my %previous=&Apache::response::check_for_previous($responsestr, |
$part,$id); |
$part,$id); |
&Apache::lonxml::debug("Got $right right and $wrong wrong, and $ignored were ignored"); |
&Apache::lonxml::debug("Got $right right and $wrong wrong, and $ignored were ignored"); |
my $ad; |
|
if ($wrong==0 && $ignored==0) { |
|
$ad='EXACT_ANS'; |
|
} elsif ($wrong==0 && $right==0) { |
|
#nothing submitted |
|
} else { |
|
if ($ignored==0) { |
|
$ad='INCORRECT'; |
|
} else { |
|
$ad='MISSING_ANSWER'; |
|
} |
|
} |
|
$Apache::lonhomework::results{"resource.$part.$id.submission"}= |
$Apache::lonhomework::results{"resource.$part.$id.submission"}= |
$responsestr; |
$responsestr; |
$Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}=$gradestr; |
$Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}=$gradestr; |
$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}= |
|
$ad; |
if (!$Apache::lonhomework::scantronmode) { |
&Apache::response::handle_previous(\%previous,$ad); |
my $ad; |
|
if ($wrong==0 && $ignored==0) { |
|
$ad='EXACT_ANS'; |
|
} elsif ($wrong==0 && $right==0) { |
|
#nothing submitted |
|
} else { |
|
if ($ignored==0) { |
|
$ad='INCORRECT'; |
|
} else { |
|
$ad='MISSING_ANSWER'; |
|
} |
|
} |
|
$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad; |
|
&Apache::response::handle_previous(\%previous,$ad); |
|
} else { |
|
my $ad; |
|
if ($wrong==0 && $right==0) { |
|
#nothing submitted |
|
} else { |
|
$ad='ASSIGNED_SCORE'; |
|
} |
|
$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad; |
|
$Apache::lonhomework::results{"resource.$part.$id.awarded"}= |
|
$right/(scalar(@whichopt)); |
|
$Apache::lonhomework::results{"resource.$part.$id.numfoils"}= |
|
scalar(@whichopt); |
|
} |
} |
} |
} |
} |
|
&Apache::lonxml::increment_counter(&getfoilcounts($max)); |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result.=&Apache::edit::end_table(); |
$result.=&Apache::edit::end_table(); |
} |
} |
if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') {$result .= '\end{enumerate}';} |
if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') { |
|
$result .= '\end{enumerate}'; |
|
} |
return $result; |
return $result; |
} |
} |
|
|
Line 245 sub getfoilcounts {
|
Line 267 sub getfoilcounts {
|
} |
} |
|
|
sub whichfoils { |
sub whichfoils { |
my ($max,$randomize)=@_; |
my ($max,$randomize)=@_; |
$max = &getfoilcounts($max); |
return &Apache::response::whichorder($max,$randomize, |
&Apache::lonxml::debug("randomize $randomize"); |
&Apache::response::showallfoils(), |
if (!defined(@{ $Apache::response::foilgroup{'names'} })) {return;} |
\%Apache::response::foilgroup); |
my @names = @{ $Apache::response::foilgroup{'names'} }; |
|
my @whichopt =(); |
|
my (%top,@toplist,%bottom,@bottomlist); |
|
if (!(&Apache::response::showallfoils() || ($randomize eq 'no'))) { |
|
my $current=0; |
|
foreach my $name (@names) { |
|
$current++; |
|
if ($Apache::response::foilgroup{$name.'.location'} eq 'top') { |
|
$top{$name}=$current; |
|
} elsif ($Apache::response::foilgroup{$name.'.location'} eq |
|
'bottom') { |
|
$bottom{$name}=$current; |
|
} |
|
} |
|
} |
|
while ((($#whichopt+1) < $max) && ($#names > -1)) { |
|
&Apache::lonxml::debug("Have $#whichopt max is $max"); |
|
my $aopt; |
|
if (&Apache::response::showallfoils() || ($randomize eq 'no')) { |
|
$aopt=0; |
|
} else { |
|
$aopt=int(&Math::Random::random_uniform() * ($#names+1)); |
|
} |
|
&Apache::lonxml::debug("From $#whichopt $max $#names elms, picking $aopt"); |
|
$aopt=splice(@names,$aopt,1); |
|
&Apache::lonxml::debug("Picked $aopt"); |
|
if ($top{$aopt}) { |
|
$toplist[$top{$aopt}]=$aopt; |
|
} elsif ($bottom{$aopt}) { |
|
$bottomlist[$bottom{$aopt}]=$aopt; |
|
} else { |
|
push (@whichopt,$aopt); |
|
} |
|
} |
|
for (my $i=0;$i<=$#toplist;$i++) { |
|
if ($toplist[$i]) { unshift(@whichopt,$toplist[$i]) } |
|
} |
|
for (my $i=0;$i<=$#bottomlist;$i++) { |
|
if ($bottomlist[$i]) { push(@whichopt,$bottomlist[$i]) } |
|
} |
|
|
|
return @whichopt; |
|
} |
} |
|
|
sub displayanswers { |
sub displayanswers { |
Line 313 sub displayfoils {
|
Line 293 sub displayfoils {
|
my @names = @{ $Apache::response::foilgroup{'names'} }; |
my @names = @{ $Apache::response::foilgroup{'names'} }; |
my @truelist; |
my @truelist; |
my @falselist; |
my @falselist; |
my $result; |
my $result; |
my $name; |
my $name; |
my $displayoptionintex=0; |
my $displayoptionintex=0; |
my @alphabet = ('A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P', |
my @alphabet = ('A'..'Z'); |
'Q','R','S','T','U','V','W','X','Y','Z'); |
|
my @whichopt = &whichfoils($max,$randomize); |
my @whichopt = &whichfoils($max,$randomize); |
my $part=$Apache::inputtags::part; |
my $part=$Apache::inputtags::part; |
my $id=$Apache::inputtags::response[-1]; |
my $id=$Apache::inputtags::response[-1]; |
my $break; |
my $break; |
my $solved=$Apache::lonhomework::history{"resource.$part.solved"}; |
my $solved=$Apache::lonhomework::history{"resource.$part.solved"}; |
my $status=$Apache::inputtags::status[-1]; |
my $status=$Apache::inputtags::status[-1]; |
if ( |
if ( ($target ne 'tex') && |
($target ne 'tex') && |
&Apache::response::show_answer() ) { |
(($solved =~ /^correct/) || ($status eq 'SHOW_ANSWER')) ) { |
|
foreach $name (@whichopt) { |
foreach $name (@whichopt) { |
my $text=$Apache::response::foilgroup{$name.'.text'}; |
my $text=$Apache::response::foilgroup{$name.'.text'}; |
if ($text!~/^\s*$/) { |
if ($text!~/^\s*$/) { |
Line 349 sub displayfoils {
|
Line 327 sub displayfoils {
|
$result.=$text."\n"; |
$result.=$text."\n"; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
$Apache::response::foilgroup{$name.'.text'}=~s/\\item//; |
$Apache::response::foilgroup{$name.'.text'}=~s/\\item//; |
$result .='\item \textit{'.$Apache::response::foilgroup{$name.'.value'}.'}'. |
if ($max>1) {$result .='\item ';} |
|
$result .=' \textit{'.$Apache::response::foilgroup{$name.'.value'}.'}'. |
":".$Apache::response::foilgroup{$name.'.text'}."\n"; |
":".$Apache::response::foilgroup{$name.'.text'}."\n"; |
} |
} |
if ($Apache::lonhomework::type eq 'exam') { |
if ($Apache::lonhomework::type eq 'exam') { |
Line 363 sub displayfoils {
|
Line 342 sub displayfoils {
|
} else { |
} else { |
my $temp=1; |
my $temp=1; |
my %lastresponse=&Apache::lonnet::str2hash($Apache::lonhomework::history{"resource.$part.$id.submission"}); |
my %lastresponse=&Apache::lonnet::str2hash($Apache::lonhomework::history{"resource.$part.$id.submission"}); |
|
my $internal_counter=$Apache::lonxml::counter; |
foreach $name (@whichopt) { |
foreach $name (@whichopt) { |
my $text=$Apache::response::foilgroup{$name.'.text'}; |
my $text=$Apache::response::foilgroup{$name.'.text'}; |
if ($text!~/^\s*$/) { |
if ($text!~/^\s*$/) { |
Line 383 sub displayfoils {
|
Line 363 sub displayfoils {
|
} |
} |
} |
} |
if ($target ne 'tex') { |
if ($target ne 'tex') { |
$optionlist='<select name="HWVAL_'. |
if ($Apache::lonhomework::type ne 'exam') { |
|
$optionlist='<select name="HWVAL_'. |
$Apache::inputtags::response['-1'].':'.$temp.'">'. |
$Apache::inputtags::response['-1'].':'.$temp.'">'. |
$optionlist."</select>\n"; |
$optionlist."</select>\n"; |
|
} |
my $text=$Apache::response::foilgroup{$name.'.text'}; |
my $text=$Apache::response::foilgroup{$name.'.text'}; |
if (!($text=~s|<drawoptionlist\s*/>|$optionlist|)) { |
if (!($text=~s|<drawoptionlist\s*/>|$optionlist|) && $Apache::lonhomework::type ne 'exam') { |
$text=$optionlist.$text; |
$text=$optionlist.$text; |
} |
} |
$result.=$break.$text."\n"; |
$result.=$break.$text."\n"; |
if ($Apache::lonhomework::type eq 'exam') { |
if ($Apache::lonhomework::type eq 'exam') { |
$result.=&webbubbles(\@opt,\@alphabet); |
$result.=&webbubbles(\@opt,\@alphabet,$temp); |
} |
} |
$temp++; |
$temp++; |
} else { |
} else { |
Line 415 sub displayfoils {
|
Line 397 sub displayfoils {
|
} |
} |
} |
} |
if ($Apache::lonhomework::type eq 'exam') { |
if ($Apache::lonhomework::type eq 'exam') { |
$result.='\vskip -2 mm\parbox{\textwidth}{\begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]\parbox{\textwidth - 5 mm}{'.&bubbles(\@alphabet,\@opt).'}\end{enumerate}} \vskip -9 mm \strut '; |
$result.='\vskip -2 mm\parbox{\textwidth}{\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]\parbox{\textwidth - 5 mm}{'.&bubbles(\@alphabet,\@opt).'}\end{enumerate}} \vskip -9 mm \strut '; |
|
$internal_counter++; |
} |
} |
$displayoptionintex=1; |
$displayoptionintex=1; |
} else { |
} else { |
Line 435 sub displayfoils {
|
Line 418 sub displayfoils {
|
} |
} |
} |
} |
if ($Apache::lonhomework::type eq 'exam') { |
if ($Apache::lonhomework::type eq 'exam') { |
$result.='\vskip -2 mm \parbox{\textwidth}{\begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]\parbox{\textwidth - 5 mm}{'.&bubbles(\@alphabet,\@opt).'}\end{enumerate}} \vskip -9 mm \strut '; |
$result.='\vskip -2 mm \parbox{\textwidth}{\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]\parbox{\textwidth - 5 mm}{'.&bubbles(\@alphabet,\@opt).'}\end{enumerate}} \vskip -9 mm \strut '; |
|
$internal_counter++; |
} |
} |
} |
} |
} |
} |
Line 452 sub displayfoils {
|
Line 436 sub displayfoils {
|
sub optionlist_correction { |
sub optionlist_correction { |
|
|
my $texoptionlist = shift; |
my $texoptionlist = shift; |
$texoptionlist =~ s/<option><\/option>/\\item \[\] Possible answers are:/; |
if ($texoptionlist=~/<option selected/ or $texoptionlist=~/<option>[^<]+<\/option>/) { |
$texoptionlist =~ s/<option>/\{\\bf /g; |
$texoptionlist =~ s/<option><\/option>/\\item \[\] Choices: /; |
$texoptionlist =~ s/<option selected="on">/\{\\bf /g; |
$texoptionlist =~ s/<option>/\{\\bf /g; |
$texoptionlist =~ s/<\/option>/\},/g; |
$texoptionlist =~ s/<option selected="on">/\{\\bf /g; |
$texoptionlist =~ s/,$/\./g; |
$texoptionlist =~ s/<\/option>/\},/g; |
$texoptionlist =~ s/>/\$>\$/g; |
$texoptionlist =~ s/,$/\./g; |
$texoptionlist =~ s/</\$<\$/g; |
$texoptionlist =~ s/>/\$>\$/g; |
$texoptionlist =~ s/=/\$=\$/g; |
$texoptionlist =~ s/</\$<\$/g; |
$texoptionlist =~ s/\^(\d+)/<m>\$$1\$<\/m>/g; |
$texoptionlist =~ s/=/\$=\$/g; |
|
$texoptionlist =~ s/\^(\d+)/<m>\$$1\$<\/m>/g; |
|
} else { |
|
$texoptionlist =~ s/<option><\/option>/\\item \[\] \\vskip -5 mm/; |
|
} |
return $texoptionlist; |
return $texoptionlist; |
} |
} |
|
|
|
|
sub webbubbles { |
sub webbubbles { |
|
|
my ($ropt,$ralphabet)=@_; |
my ($ropt,$ralphabet,$temp)=@_; |
my @opt=@$ropt; |
my @opt=@$ropt; |
my @alphabet=@$ralphabet; |
my @alphabet=@$ralphabet; |
my $result=''; |
my $result=''; |
my $number_of_bubbles = $#opt + 1; |
my $number_of_bubbles = $#opt + 1; |
$result.= '<table border="1"><tr>'; |
$result.= '<table border="1"><tr>'; |
for (my $ind=0;$ind<$number_of_bubbles;$ind++) { |
for (my $ind=0;$ind<$number_of_bubbles;$ind++) { |
$result.='<td>'.$alphabet[$ind].': '.$opt[$ind].'</td>'; |
$result.='<td><input type="radio" name="HWVAL_'.$Apache::inputtags::response['-1'].':'.$temp. |
|
'" value='.$opt[$ind].'>'.$alphabet[$ind].': '.$opt[$ind].'</td>'; |
} |
} |
$result.='</tr></table>'; |
$result.='</tr></table>'; |
return $result; |
return $result; |
Line 503 sub bubbles {
|
Line 492 sub bubbles {
|
} |
} |
|
|
} |
} |
&Apache::lonxml::increment_counter(); |
|
return $result; |
return $result; |
} |
} |
|
|
Line 644 sub end_foil {
|
Line 632 sub end_foil {
|
} else { |
} else { |
push @{ $Apache::response::foilgroup{'names'} }, $name; |
push @{ $Apache::response::foilgroup{'names'} }, $name; |
$Apache::response::foilgroup{"$name.value"} = $value; |
$Apache::response::foilgroup{"$name.value"} = $value; |
if ($Apache::lonhomework::type eq 'exam') { |
if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') { |
$Apache::response::foilgroup{"$name.text"} = '\vskip 5 mm $\triangleright$ '.$text; |
$Apache::response::foilgroup{"$name.text"} = '\vskip 5 mm $\triangleright$ '.$text; |
} else { |
} else { |
if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') { |
if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') { |