version 1.34, 2002/03/29 18:32:46
|
version 1.43, 2002/07/18 15:45:41
|
Line 63 sub start_optionresponse {
|
Line 63 sub start_optionresponse {
|
my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]"; |
my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]"; |
push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id); |
push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id); |
} |
} |
# if ($target eq 'tex') {$result .= '\begin{itemize}';} |
|
return $result; |
return $result; |
} |
} |
|
|
Line 74 sub end_optionresponse {
|
Line 73 sub end_optionresponse {
|
&Apache::lonxml::deregister('Apache::optionresponse',('foilgroup','foil','conceptgroup')); |
&Apache::lonxml::deregister('Apache::optionresponse',('foilgroup','foil','conceptgroup')); |
my $result; |
my $result; |
if ($target eq 'edit') { $result=&Apache::edit::end_table(); } |
if ($target eq 'edit') { $result=&Apache::edit::end_table(); } |
# if ($target eq 'tex') {$result .= '\end{itemize}';} |
|
return $result; |
return $result; |
} |
} |
|
|
Line 132 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 140 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{itemize}';} |
if ($target eq 'tex') { |
|
$result .= ' \begin{enumerate} '; |
|
} |
return $result; |
return $result; |
} |
} |
|
|
Line 148 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' || $target eq 'tex') { |
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 166 sub end_foilgroup {
|
Line 166 sub end_foilgroup {
|
if (defined($Apache::lonhomework::analyze{"$part_id.foil.value.$name"})) { next; } |
if (defined($Apache::lonhomework::analyze{"$part_id.foil.value.$name"})) { next; } |
push (@{ $Apache::lonhomework::analyze{"$part_id.foils"} },$name); |
push (@{ $Apache::lonhomework::analyze{"$part_id.foils"} },$name); |
$Apache::lonhomework::analyze{"$part_id.foil.value.$name"} = |
$Apache::lonhomework::analyze{"$part_id.foil.value.$name"} = |
$Apache::response::conceptgroup{"$name.value"}; |
$Apache::response::foilgroup{"$name.value"}; |
$Apache::lonhomework::analyze{"$part_id.foil.text.$name"} = |
$Apache::lonhomework::analyze{"$part_id.foil.text.$name"} = |
$Apache::response::conceptgroup{"$name.text"}; |
$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 202 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 214 sub end_foilgroup {
|
Line 220 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{itemize}';} |
if ($target eq 'tex') {$result .= '\end{enumerate}';} |
return $result; |
return $result; |
} |
} |
|
|
Line 223 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 232 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 269 sub displayfoils {
|
Line 281 sub displayfoils {
|
foreach $name (@whichopt) { |
foreach $name (@whichopt) { |
if ($target eq 'web') { |
if ($target eq 'web') { |
$result.="<br />"; |
$result.="<br />"; |
} elsif ($target eq 'tex') { |
|
$result.='\newline'; |
|
} |
} |
$result .=$Apache::response::foilgroup{$name.'.value'}. |
$result .=$Apache::response::foilgroup{$name.'.value'}. |
":".$Apache::response::foilgroup{$name.'.text'}."\n"; |
":".$Apache::response::foilgroup{$name.'.text'}."\n"; |
Line 301 sub displayfoils {
|
Line 311 sub displayfoils {
|
$durtyoptionlist =~ s/<option>/{\\bf /g; |
$durtyoptionlist =~ s/<option>/{\\bf /g; |
$durtyoptionlist =~ s/<\/option>/},/g; |
$durtyoptionlist =~ s/<\/option>/},/g; |
$durtyoptionlist =~ s/,$/\./g; |
$durtyoptionlist =~ s/,$/\./g; |
$result.= $durtyoptionlist.$Apache::response::foilgroup{$name.'.text'}; |
$durtyoptionlist =~ s/>/\$>\$/g; |
|
$durtyoptionlist =~ s/</\$<\$/g; |
|
$durtyoptionlist =~ s/=/\$=\$/g; |
|
$result.= $durtyoptionlist.'\item '.$Apache::response::foilgroup{$name.'.text'}; |
$Apache::optionresponse::displayoptionintex=1; |
$Apache::optionresponse::displayoptionintex=1; |
} else { |
} else { |
$result.= $Apache::response::foilgroup{$name.'.text'}; |
$result.= '\item '.$Apache::response::foilgroup{$name.'.text'}; |
} |
} |
} |
} |
} |
} |
Line 340 sub end_conceptgroup {
|
Line 353 sub end_conceptgroup {
|
$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 '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') { |
} elsif ($target eq 'edit') { |
$result=&Apache::edit::end_table(); |
$result=&Apache::edit::end_table(); |
} elsif ($target eq 'analyze') { |
|
my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]"; |
|
my $concept = &Apache::lonxml::get_param('concept',$parstack,$safeeval); |
|
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"}; |
|
} |
|
} |
} |
return $result; |
return $result; |
} |
} |
Line 395 sub start_foil {
|
Line 412 sub start_foil {
|
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); } |
} |
} |
if ($target eq 'tex') {$result .= '\item ';} |
|
return $result; |
return $result; |
} |
} |
|
|
Line 414 sub end_foil {
|
Line 430 sub end_foil {
|
&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; |
} |
} |
} |
} |