version 1.31, 2002/01/17 12:23:31
|
version 1.45, 2002/08/05 15:55:39
|
Line 26
|
Line 26
|
# http://www.lon-capa.org/ |
# http://www.lon-capa.org/ |
# |
# |
# 2/21 Guy |
# 2/21 Guy |
|
# 01/18 Alex |
package Apache::optionresponse; |
package Apache::optionresponse; |
use strict; |
use strict; |
use Apache::response; |
use Apache::response; |
Line 49 sub start_optionresponse {
|
Line 50 sub start_optionresponse {
|
&Apache::edit::end_row(). |
&Apache::edit::end_row(). |
&Apache::edit::start_spanning_row(). |
&Apache::edit::start_spanning_row(). |
"\n"; |
"\n"; |
$result.=&Apache::edit::text_arg('Max Number Of Foils:','max',$token,'4'). |
$result.=&Apache::edit::text_arg('Max Number Of Shown Foils:','max',$token,'4'). |
&Apache::edit::end_row(). |
&Apache::edit::end_row(). |
&Apache::edit::start_spanning_row(); |
&Apache::edit::start_spanning_row(); |
} |
} elsif ($target eq 'modified') { |
if ($target eq 'modified') { |
|
my $constructtag=&Apache::edit::get_new_args($token,$parstack, |
my $constructtag=&Apache::edit::get_new_args($token,$parstack, |
$safeeval,'max'); |
$safeeval,'max'); |
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } |
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } |
} |
} elsif ($target eq 'meta') { |
if ($target eq 'meta') { |
|
$result=&Apache::response::meta_package_write('optionresponse'); |
$result=&Apache::response::meta_package_write('optionresponse'); |
|
} elsif ($target eq 'analyze') { |
|
my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]"; |
|
push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id); |
} |
} |
return $result; |
return $result; |
} |
} |
Line 74 sub end_optionresponse {
|
Line 76 sub end_optionresponse {
|
return $result; |
return $result; |
} |
} |
|
|
%Apache::response::foilgroup={}; |
%Apache::response::foilgroup=(); |
sub start_foilgroup { |
sub start_foilgroup { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
|
|
my $result=''; |
my $result=''; |
%Apache::response::foilgroup={}; |
%Apache::response::foilgroup=(); |
$Apache::optionresponse::conceptgroup=0; |
$Apache::optionresponse::conceptgroup=0; |
&Apache::response::setrandomnumber(); |
&Apache::response::setrandomnumber(); |
if ($target eq 'edit') { |
if ($target eq 'edit') { |
Line 128 ENDTABLE
|
Line 130 ENDTABLE
|
if ($optchanged) { |
if ($optchanged) { |
$result = "<foilgroup options=\"("; |
$result = "<foilgroup options=\"("; |
foreach my $option (@options) { |
foreach my $option (@options) { |
$option=~s/\'/\\\'/; |
$option=~s/\'/\\\'/g; |
&Apache::lonxml::debug("adding option :$option:"); |
&Apache::lonxml::debug("adding option :$option:"); |
$result .="'".$option."',"; |
$result .="'".$option."',"; |
} |
} |
Line 136 ENDTABLE
|
Line 138 ENDTABLE
|
$result.=')">'; |
$result.=')">'; |
} # else nothing changed so just use the default mechanism |
} # else nothing changed so just use the default mechanism |
} |
} |
|
if ($target eq 'tex') { |
|
$result .= ' \begin{enumerate} '; |
|
} |
return $result; |
return $result; |
} |
} |
|
|
Line 143 sub end_foilgroup {
|
Line 148 sub end_foilgroup {
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
|
|
my $result; |
my $result; |
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer') { |
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex' || $target eq 'analyze') { |
my $name; |
my $name; |
my ($count,$max) = &getfoilcounts($parstack,$safeeval); |
my ($count,$max) = &getfoilcounts($parstack,$safeeval); |
if ($count>$max) { $count=$max } |
if ($count>$max) { $count=$max } |
Line 151 sub end_foilgroup {
|
Line 156 sub end_foilgroup {
|
my @opt; |
my @opt; |
eval '@opt ='.&Apache::lonxml::get_param('options',$parstack,$safeeval); |
eval '@opt ='.&Apache::lonxml::get_param('options',$parstack,$safeeval); |
&Apache::lonxml::debug("Options are $#opt"); |
&Apache::lonxml::debug("Options are $#opt"); |
if ($target eq 'web') { |
if ($target eq 'web' || $target eq 'tex') { |
$result.=&displayfoils($count,@opt); |
$result.=&displayfoils($target,$count,@opt); |
} elsif ( $target eq 'answer') { |
} elsif ( $target eq 'answer') { |
$result.=&displayanswers($count,@opt); |
$result.=&displayanswers($count,@opt); |
|
} elsif ( $target eq 'analyze') { |
|
my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]"; |
|
foreach my $name (@{ $Apache::response::foilgroup{'names'} }) { |
|
if (defined($Apache::lonhomework::analyze{"$part_id.foil.value.$name"})) { next; } |
|
push (@{ $Apache::lonhomework::analyze{"$part_id.foils"} },$name); |
|
$Apache::lonhomework::analyze{"$part_id.foil.value.$name"} = |
|
$Apache::response::foilgroup{"$name.value"}; |
|
$Apache::lonhomework::analyze{"$part_id.foil.text.$name"} = |
|
$Apache::response::foilgroup{"$name.text"}; |
|
} |
|
push (@{ $Apache::lonhomework::analyze{"$part_id.options"} },@opt); |
|
push (@{ $Apache::lonhomework::analyze{"$part_id.shown"} },&whichfoils($count)); |
} elsif ( $target eq 'grade') { |
} elsif ( $target eq 'grade') { |
if ( defined $ENV{'form.submitted'}) { |
if ( defined $ENV{'form.submitted'}) { |
my @whichopt = &whichfoils($count); |
my @whichopt = &whichfoils($count); |
Line 167 sub end_foilgroup {
|
Line 184 sub end_foilgroup {
|
my $response = $ENV{'form.HWVAL_'.$Apache::inputtags::response['-1'].":$temp"}; |
my $response = $ENV{'form.HWVAL_'.$Apache::inputtags::response['-1'].":$temp"}; |
$responsehash{$name}=$response; |
$responsehash{$name}=$response; |
if ( $response =~ /[^\s]/) { |
if ( $response =~ /[^\s]/) { |
&Apache::lonxml::debug("submitted a $response<br />\n"); |
|
my $value=$Apache::response::foilgroup{$name.'.value'}; |
my $value=$Apache::response::foilgroup{$name.'.value'}; |
|
&Apache::lonxml::debug("submitted a $response for $value<br />\n"); |
if ($value eq $response) {$right++;} else {$wrong++;} |
if ($value eq $response) {$right++;} else {$wrong++;} |
} else { |
} else { |
$ignored++; |
$ignored++; |
Line 187 sub end_foilgroup {
|
Line 204 sub end_foilgroup {
|
} elsif ($wrong==0 && $right==0) { |
} elsif ($wrong==0 && $right==0) { |
#nothing submitted |
#nothing submitted |
} else { |
} else { |
$ad='INCORRECT'; |
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; |
Line 198 sub end_foilgroup {
|
Line 219 sub end_foilgroup {
|
} |
} |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result.=&Apache::edit::end_table(); |
$result.=&Apache::edit::end_table(); |
} |
} |
|
if ($target eq 'tex') {$result .= '\end{enumerate}';} |
return $result; |
return $result; |
} |
} |
|
|
Line 207 sub getfoilcounts {
|
Line 229 sub getfoilcounts {
|
my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2'); |
my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2'); |
# +1 since instructors will count from 1 |
# +1 since instructors will count from 1 |
my $count = $#{ $Apache::response::foilgroup{'names'} }+1; |
my $count = $#{ $Apache::response::foilgroup{'names'} }+1; |
|
if (&Apache::response::showallfoils()) { $max=$count; } |
return ($count,$max); |
return ($count,$max); |
} |
} |
|
|
Line 216 sub whichfoils {
|
Line 239 sub whichfoils {
|
my @whichopt =(); |
my @whichopt =(); |
while ((($#whichopt+1) < $max) && ($#names > -1)) { |
while ((($#whichopt+1) < $max) && ($#names > -1)) { |
&Apache::lonxml::debug("Have $#whichopt max is $max"); |
&Apache::lonxml::debug("Have $#whichopt max is $max"); |
my $aopt=int(rand($#names+1)); |
my $aopt; |
|
if (&Apache::response::showallfoils()) { |
|
$aopt=0; |
|
} else { |
|
$aopt=int(rand($#names+1)); |
|
} |
&Apache::lonxml::debug("From $#whichopt $max $#names elms, picking $aopt"); |
&Apache::lonxml::debug("From $#whichopt $max $#names elms, picking $aopt"); |
$aopt=splice(@names,$aopt,1); |
$aopt=splice(@names,$aopt,1); |
&Apache::lonxml::debug("Picked $aopt"); |
&Apache::lonxml::debug("Picked $aopt"); |
Line 239 sub displayanswers {
|
Line 267 sub displayanswers {
|
} |
} |
|
|
sub displayfoils { |
sub displayfoils { |
my ($max,@opt)=@_; |
my ($target,$max,@opt)=@_; |
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 @whichopt = &whichfoils($max); |
my @whichopt = &whichfoils($max); |
my $part=$Apache::inputtags::part; |
my $part=$Apache::inputtags::part; |
my $id=$Apache::inputtags::response[-1]; |
my $id=$Apache::inputtags::response[-1]; |
if (($Apache::lonhomework::history{"resource.$part.solved"} =~ /^correct/) || ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER')) { |
if (($Apache::lonhomework::history{"resource.$part.solved"} =~ /^correct/) || ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER')) { |
foreach $name (@whichopt) { |
foreach $name (@whichopt) { |
$result.="<br />".$Apache::response::foilgroup{$name.'.value'}. |
if ($target eq 'web') { |
":".$Apache::response::foilgroup{$name.'.text'}."\n"; |
$result.="<br />"; |
|
} |
|
$result .=$Apache::response::foilgroup{$name.'.value'}. |
|
":".$Apache::response::foilgroup{$name.'.text'}."\n"; |
} |
} |
} else { |
} else { |
my $temp=1; |
my $temp=1; |
Line 267 sub displayfoils {
|
Line 299 sub displayfoils {
|
$optionlist.="<option>$option</option>\n"; |
$optionlist.="<option>$option</option>\n"; |
} |
} |
} |
} |
$result.="<br /><select name=\"HWVAL_$Apache::inputtags::response['-1']:$temp\">" |
if ($target ne 'tex') { |
.$optionlist |
$result.="<br /><select name=\"HWVAL_$Apache::inputtags::response['-1']:$temp\">" |
."</select>\n".$Apache::response::foilgroup{$name.'.text'}."\n"; |
.$optionlist |
$temp++; |
."</select>\n".$Apache::response::foilgroup{$name.'.text'}."\n"; |
|
$temp++; |
|
} else { |
|
if ($displayoptionintex == 0) { |
|
my $texoptionlist = $optionlist; |
|
$texoptionlist =~ s/<option><\/option>/\\item \[\] The possible answers are:/; |
|
$texoptionlist =~ s/<option>/{\\bf /g; |
|
$texoptionlist =~ s/<\/option>/},/g; |
|
$texoptionlist =~ s/,$/\./g; |
|
$texoptionlist =~ s/>/\$>\$/g; |
|
$texoptionlist =~ s/</\$<\$/g; |
|
$texoptionlist =~ s/=/\$=\$/g; |
|
$result.= $texoptionlist.'\item '.$Apache::response::foilgroup{$name.'.text'}; |
|
$displayoptionintex=1; |
|
} else { |
|
$result.= '\item '.$Apache::response::foilgroup{$name.'.text'}; |
|
} |
|
} |
} |
} |
|
} |
|
if ($target ne 'tex') { |
|
return $result."<br />"; |
|
} |
|
else { |
|
return $result; |
} |
} |
return $result."<br />"; |
|
} |
} |
|
|
|
|
sub start_conceptgroup { |
sub start_conceptgroup { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
$Apache::optionresponse::conceptgroup=1; |
$Apache::optionresponse::conceptgroup=1; |
%Apache::response::conceptgroup={}; |
%Apache::response::conceptgroup=(); |
my $result; |
my $result; |
if ($target eq 'edit') { |
if ($target eq 'edit') { |
$result.=&Apache::edit::tag_start($target,$token,"Concept Grouped Foils"); |
$result.=&Apache::edit::tag_start($target,$token,"Concept Grouped Foils"); |
Line 298 sub end_conceptgroup {
|
Line 352 sub end_conceptgroup {
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
$Apache::optionresponse::conceptgroup=0; |
$Apache::optionresponse::conceptgroup=0; |
my $result=''; |
my $result=''; |
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') { |
#if not there aren't any foils to display and thus no question |
#if not there aren't any foils to display and thus no question |
if (defined(@{ $Apache::response::conceptgroup{'names'} })) { |
if (defined(@{ $Apache::response::conceptgroup{'names'} })) { |
my @names = @{ $Apache::response::conceptgroup{'names'} }; |
my @names = @{ $Apache::response::conceptgroup{'names'} }; |
my $pick=int rand $#names+1; |
my $pick=int rand $#names+1; |
my $name=$names[$pick]; |
my $name=$names[$pick]; |
push @{ $Apache::response::foilgroup{'names'} }, $name; |
push @{ $Apache::response::foilgroup{'names'} }, $name; |
$Apache::response::foilgroup{"$name.value"} = $Apache::response::conceptgroup{"$name.value"}; |
$Apache::response::foilgroup{"$name.value"} = |
$Apache::response::foilgroup{"$name.text"} = $Apache::response::conceptgroup{"$name.text"}; |
$Apache::response::conceptgroup{"$name.value"}; |
|
$Apache::response::foilgroup{"$name.text"} = |
|
$Apache::response::conceptgroup{"$name.text"}; |
my $concept = &Apache::lonxml::get_param('concept',$parstack,$safeeval); |
my $concept = &Apache::lonxml::get_param('concept',$parstack,$safeeval); |
$Apache::response::foilgroup{"$name.concept"} = $concept; |
$Apache::response::foilgroup{"$name.concept"} = $concept; |
&Apache::lonxml::debug("Selecting $name in $concept"); |
&Apache::lonxml::debug("Selecting $name in $concept"); |
|
if ($target eq 'analyze') { |
|
my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]"; |
|
push (@{ $Apache::lonhomework::analyze{"$part_id.concepts"} }, |
|
$concept); |
|
$Apache::lonhomework::analyze{"$part_id.concept.$concept"}= |
|
$Apache::response::conceptgroup{'names'}; |
|
foreach my $name (@{ $Apache::response::conceptgroup{'names'} }) { |
|
push (@{ $Apache::lonhomework::analyze{"$part_id.foils"} }, |
|
$name); |
|
$Apache::lonhomework::analyze{"$part_id.foil.value.$name"} = |
|
$Apache::response::conceptgroup{"$name.value"}; |
|
$Apache::lonhomework::analyze{"$part_id.foil.text.$name"} = |
|
$Apache::response::conceptgroup{"$name.text"}; |
|
} |
|
} |
} |
} |
} |
} elsif ($target eq 'edit') { |
if ($target eq 'edit') { |
|
$result=&Apache::edit::end_table(); |
$result=&Apache::edit::end_table(); |
} |
} |
return $result; |
return $result; |
Line 326 sub insert_conceptgroup {
|
Line 397 sub insert_conceptgroup {
|
sub start_foil { |
sub start_foil { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $result=''; |
my $result=''; |
if ($target eq 'web') { |
if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze' ) { |
&Apache::lonxml::startredirection; |
&Apache::lonxml::startredirection; |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result=&Apache::edit::tag_start($target,$token,"Foil"); |
$result=&Apache::edit::tag_start($target,$token,"Foil"); |
Line 340 sub start_foil {
|
Line 411 sub start_foil {
|
} elsif ($target eq 'modified') { |
} elsif ($target eq 'modified') { |
my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'value','name'); |
my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'value','name'); |
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } |
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } |
} |
} |
return $result; |
return $result; |
} |
} |
|
|
Line 348 sub end_foil {
|
Line 419 sub end_foil {
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $text =''; |
my $text =''; |
my $result = ''; |
my $result = ''; |
if ($target eq 'web') { $text=&Apache::lonxml::endredirection; } |
if ($target eq 'web' || $target eq 'tex') { |
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') { |
$text=&Apache::lonxml::endredirection; |
|
} |
|
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' |
|
|| $target eq 'tex' || $target eq 'analyze') { |
my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval); |
my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval); |
if ($value ne 'unused') { |
if ($value ne 'unused') { |
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) { $name=$Apache::lonxml::curdepth; } |
if (!$name) { $name=$Apache::lonxml::curdepth; } |
&Apache::lonxml::debug("Using a name of :$name:"); |
&Apache::lonxml::debug("Using a name of :$name:"); |
if ( $Apache::optionresponse::conceptgroup ) { |
if ( $Apache::optionresponse::conceptgroup |
|
&& !&Apache::response::showallfoils() ) { |
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; |
} else { |
} else { |
push @{ $Apache::response::foilgroup{'names'} }, $name; |
push @{ $Apache::response::foilgroup{'names'} }, $name; |
$Apache::response::foilgroup{"$name.value"} = $value; |
if ($target eq 'tex') { |
|
$Apache::response::foilgroup{"$name.value"} = '\item '.$value; |
|
} else { |
|
$Apache::response::foilgroup{"$name.value"} = $value; |
|
} |
$Apache::response::foilgroup{"$name.text"} = $text; |
$Apache::response::foilgroup{"$name.text"} = $text; |
} |
} |
} |
} |