version 1.20, 2003/09/24 17:57:42
|
version 1.51, 2007/03/27 19:20:49
|
Line 24
|
Line 24
|
# |
# |
# http://www.lon-capa.org/ |
# http://www.lon-capa.org/ |
# |
# |
# 2/21 Guy |
|
|
|
package Apache::rankresponse; |
package Apache::rankresponse; |
use strict; |
use strict; |
use HTML::Entities(); |
use HTML::Entities(); |
use Apache::optionresponse; |
use Apache::optionresponse(); |
|
use Apache::lonlocal; |
|
|
BEGIN { |
BEGIN { |
&Apache::lonxml::register('Apache::rankresponse',('rankresponse')); |
&Apache::lonxml::register('Apache::rankresponse',('rankresponse')); |
Line 44 sub start_rankresponse {
|
Line 44 sub start_rankresponse {
|
push (@Apache::lonxml::namespace,'rankresponse'); |
push (@Apache::lonxml::namespace,'rankresponse'); |
my $id = &Apache::response::start_response($parstack,$safeeval); |
my $id = &Apache::response::start_response($parstack,$safeeval); |
%Apache::hint::rank=(); |
%Apache::hint::rank=(); |
|
undef(%Apache::response::foilnames); |
if ($target eq 'meta') { |
if ($target eq 'meta') { |
$result=&Apache::response::meta_package_write('rankresponse'); |
$result=&Apache::response::meta_package_write('rankresponse'); |
} elsif ($target eq 'edit' ) { |
} elsif ($target eq 'edit' ) { |
Line 63 sub start_rankresponse {
|
Line 64 sub start_rankresponse {
|
$safeeval,'max', |
$safeeval,'max', |
'randomize'); |
'randomize'); |
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } |
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } |
|
} elsif ($target eq 'analyze') { |
|
my $part_id="$Apache::inputtags::part.$id"; |
|
push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id); |
} |
} |
return $result; |
return $result; |
} |
} |
Line 75 sub end_rankresponse {
|
Line 79 sub end_rankresponse {
|
pop @Apache::lonxml::namespace; |
pop @Apache::lonxml::namespace; |
&Apache::lonxml::deregister('Apache::rankresponse', |
&Apache::lonxml::deregister('Apache::rankresponse', |
('foilgroup','foil','conceptgroup')); |
('foilgroup','foil','conceptgroup')); |
|
undef(%Apache::response::foilnames); |
return $result; |
return $result; |
} |
} |
|
|
Line 84 sub start_foilgroup {
|
Line 89 sub start_foilgroup {
|
my $result; |
my $result; |
%Apache::response::foilgroup=(); |
%Apache::response::foilgroup=(); |
$Apache::rankresponse::conceptgroup=0; |
$Apache::rankresponse::conceptgroup=0; |
&Apache::response::setrandomnumber(); |
&Apache::response::pushrandomnumber(); |
return $result; |
return $result; |
} |
} |
|
|
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; |
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 $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, |
$safeeval,'-2'); |
$safeeval,'-2'); |
Line 99 sub end_foilgroup {
|
Line 105 sub end_foilgroup {
|
if (!defined($tol)) { $tol=0; } |
if (!defined($tol)) { $tol=0; } |
if ($target eq 'web' || $target eq 'tex') { |
if ($target eq 'web' || $target eq 'tex') { |
$result=&displayfoils($target,$max,$randomize,$tol); |
$result=&displayfoils($target,$max,$randomize,$tol); |
|
$Apache::lonxml::post_evaluate=0; |
} elsif ($target eq 'answer' ) { |
} elsif ($target eq 'answer' ) { |
$result=&displayanswers($max,$randomize,$tol); |
$result=&displayanswers($max,$randomize,$tol); |
} elsif ( $target eq 'grade') { |
} elsif ( $target eq 'grade') { |
&grade_response($max,$randomize,$tol); |
&grade_response($max,$randomize,$tol); |
|
} elsif ( $target eq 'analyze') { |
|
my @shown = &whichfoils($max,$randomize); |
|
&Apache::response::analyze_store_foilgroup(\@shown, |
|
['text','value','location']); |
|
my $part_id= |
|
"$Apache::inputtags::part.$Apache::inputtags::response[-1]"; |
|
$Apache::lonhomework::analyze{"$part_id.tol"}=$tol; |
} |
} |
&Apache::lonxml::increment_counter(&getfoilcounts($max)); |
&Apache::lonxml::increment_counter(&getfoilcounts($max)); |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result=&Apache::edit::end_table(); |
$result=&Apache::edit::end_table(); |
} |
} |
|
&Apache::response::poprandomnumber(); |
return $result; |
return $result; |
} |
} |
|
|
Line 152 sub displayanswers {
|
Line 167 sub displayanswers {
|
if (!defined(@{ $Apache::response::foilgroup{'names'} })) { return; } |
if (!defined(@{ $Apache::response::foilgroup{'names'} })) { return; } |
my @names = @{ $Apache::response::foilgroup{'names'} }; |
my @names = @{ $Apache::response::foilgroup{'names'} }; |
my @whichfoils = &whichfoils($max,$randomize); |
my @whichfoils = &whichfoils($max,$randomize); |
my $result=&Apache::response::answer_header('rankresponse'); |
|
my @correctorder=&get_correct_order($tol,@whichfoils); |
my @correctorder=&get_correct_order($tol,@whichfoils); |
foreach my $order (@correctorder) { |
my $result; |
$result.=&Apache::response::answer_part('rankresponse',$order); |
if ($Apache::lonhomework::type eq 'exam') { |
|
my @alphabet = ('A'..'Z'); |
|
my $i=0; |
|
foreach my $order (@correctorder) { |
|
$result.=&Apache::response::answer_header('rankresponse',$i++); |
|
$result.=&Apache::response::answer_part('rankresponse', |
|
$alphabet[$order-1]); |
|
$result.=&Apache::response::answer_part('rankresponse',$order); |
|
$result.=&Apache::response::answer_footer('rankresponse'); |
|
} |
|
} else { |
|
$result=&Apache::response::answer_header('rankresponse'); |
|
foreach my $order (@correctorder) { |
|
$result.=&Apache::response::answer_part('rankresponse',$order); |
|
} |
|
$result.=&Apache::response::answer_footer('rankresponse'); |
} |
} |
$result.=&Apache::response::answer_footer('rankresponse'); |
|
return $result; |
return $result; |
} |
} |
|
|
sub check_response_order { |
sub check_response_order { |
my (%responsehash)=@_; |
my (%responsehash)=@_; |
my @order=sort(values(%responsehash)); |
my @order=sort( {$a <=> $b} values(%responsehash)); |
my $lastvalue=0; |
my $lastvalue=0; |
my $expected=1; |
my $expected=1; |
my $malformed=0; |
my $malformed=0; |
Line 181 sub check_response_order {
|
Line 209 sub check_response_order {
|
sub grade_response { |
sub grade_response { |
my ($max,$randomize,$tol)=@_; |
my ($max,$randomize,$tol)=@_; |
my (@whichfoils)=&whichfoils($max,$randomize); |
my (@whichfoils)=&whichfoils($max,$randomize); |
if (!defined($ENV{'form.submitted'})) { return; } |
if (!&Apache::response::submitted()) { return; } |
my %responsehash; |
my %responsehash; |
my %grade; |
my %grade; |
my ($temp,$right,$wrong,$ignored)=(0,0,0,0); |
my ($temp,$right,$wrong,$ignored)=(1,0,0,0); |
my @correctorder=&get_correct_order($tol,@whichfoils); |
my @correctorder=&get_correct_order($tol,@whichfoils); |
foreach my $name (@whichfoils) { |
foreach my $name (@whichfoils) { |
my $response = $ENV{'form.HWVAL_'.$Apache::inputtags::response['-1'].":$temp"}; |
my $response = &Apache::response::getresponse($temp,'A is 1'); |
$responsehash{$name}=$response; |
|
my $value=shift(@correctorder); |
my $value=shift(@correctorder); |
if ( $response =~ /[^\s]/) { |
if ( $response =~ /[^\s]/) { |
|
$responsehash{$name}=$response; |
&Apache::lonxml::debug("submitted a $response for $value<br />\n"); |
&Apache::lonxml::debug("submitted a $response for $value<br />\n"); |
if ($value eq $response) { |
if ($value eq $response) { |
$grade{$name}='1'; $right++; |
$grade{$name}='1'; $right++; |
Line 224 sub grade_response {
|
Line 252 sub grade_response {
|
$ad='MISSING_ANSWER'; |
$ad='MISSING_ANSWER'; |
} |
} |
} |
} |
|
if ($Apache::lonhomework::type eq 'survey' && |
|
($ad eq 'INCORRECT' || $ad eq 'EXACT_ANS') ) { |
|
$ad='SUBMITTED'; |
|
} else { |
|
$Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}=$gradestr; |
|
} |
$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.awarddetail"}=$ad; |
$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad; |
&Apache::response::handle_previous(\%previous,$ad); |
&Apache::response::handle_previous(\%previous,$ad); |
} |
} |
Line 238 sub displayfoils {
|
Line 271 sub displayfoils {
|
my (@whichfoils)=&whichfoils($max,$randomize); |
my (@whichfoils)=&whichfoils($max,$randomize); |
my $part=$Apache::inputtags::part; |
my $part=$Apache::inputtags::part; |
my $solved=$Apache::lonhomework::history{"resource.$part.solved"}; |
my $solved=$Apache::lonhomework::history{"resource.$part.solved"}; |
my $status=$Apache::inputtags::status[-1]; |
|
my @whichopt=(1..($#whichfoils+1)); |
my @whichopt=(1..($#whichfoils+1)); |
my @correctorder=&get_correct_order($tol,@whichfoils); |
my @correctorder=&get_correct_order($tol,@whichfoils); |
if ( &Apache::response::show_answer() && ($target ne 'tex')) { |
if ( &Apache::response::show_answer() && ($target ne 'tex')) { |
foreach my $name (@whichfoils) { |
foreach my $name (@whichfoils) { |
my $text=$Apache::response::foilgroup{$name.'.text'}; |
my $text=$Apache::response::foilgroup{$name.'.text'}; |
my $value=shift(@correctorder); |
my $value=shift(@correctorder); |
if ($target eq 'web') {$result.='<br />';} else {$result.=' \strut\\\\\strut ';} |
if ($target eq 'web') { |
$result.=$value.':'.$text; |
$result.='<br /><b>'.$value.':</b> '.$text; |
|
} else { |
|
$result.=' \strut\\\\\strut '.$value.':'.$text; |
|
} |
} |
} |
} else { |
} else { |
my $i = 0; |
my $i = 0; |
my $temp=0; |
my $temp=1; |
my $id=$Apache::inputtags::response[-1]; |
my $id=$Apache::inputtags::response[-1]; |
my $part=$Apache::inputtags::part; |
my $part=$Apache::inputtags::part; |
my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"}; |
my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"}; |
Line 270 sub displayfoils {
|
Line 305 sub displayfoils {
|
} |
} |
} |
} |
if ($target ne 'tex' && $Apache::lonhomework::type ne 'exam') { |
if ($target ne 'tex' && $Apache::lonhomework::type ne 'exam') { |
$optionlist='<select name="HWVAL_'. |
$optionlist='<select onchange="javascript:setSubmittedPart(\''. |
|
$part.'\');" name="HWVAL_'. |
$Apache::inputtags::response[-1].':'.$temp.'">'. |
$Apache::inputtags::response[-1].':'.$temp.'">'. |
$optionlist."</select>\n"; |
$optionlist."</select>\n"; |
} else { |
} else { |
Line 284 sub displayfoils {
|
Line 320 sub displayfoils {
|
$result.='<br />'.$text."\n"; |
$result.='<br />'.$text."\n"; |
} |
} |
if ($Apache::lonhomework::type eq 'exam') { |
if ($Apache::lonhomework::type eq 'exam') { |
$result.=&Apache::optionresponse::webbubbles(\@alp,\@whichopt,$temp); |
my @values=(1..scalar(@whichopt)); |
|
$result.=&Apache::optionresponse::webbubbles(\@values,\@whichopt,$temp,$lastopt); |
} |
} |
} else { |
} else { |
if ($Apache::lonhomework::type eq 'exam') { |
if ($Apache::lonhomework::type eq 'exam') { |
$result.='\vskip 0 mm '.$text.' \vskip -3 mm '."\n"; |
$result.='\vskip 0 mm '.$text.' \vskip 0 mm '."\n"; |
$result.='\vskip -5 mm\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]\parbox{\textwidth - 5 mm}{'.&Apache::optionresponse::bubbles(\@alp,\@whichopt).'}\end{enumerate} \vskip -5 mm \strut '; |
$result.='\vskip -1 mm\noindent\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]'.&Apache::optionresponse::bubbles(\@alp,\@whichopt,'rankresponse').'\end{enumerate} \vskip -8 mm \strut '; |
$internal_counter++; |
$internal_counter++; |
} else { |
} else { |
$result.=' \vskip 0mm \framebox[5 mm][s]{\tiny\strut} '.$text."\n"; |
$result.=' \vskip 0mm \framebox[5 mm][s]{\tiny\strut} '.$text."\n"; |
Line 342 sub end_conceptgroup {
|
Line 379 sub end_conceptgroup {
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
$Apache::rankresponse::conceptgroup=0; |
$Apache::rankresponse::conceptgroup=0; |
my $result=''; |
my $result=''; |
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') { |
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'} })) { |
&Apache::response::pick_foil_for_concept($target, |
my @names = @{ $Apache::response::conceptgroup{'names'} }; |
['value','text','location'], |
my $pick=int(&Math::Random::random_uniform() * ($#names+1)); |
\%Apache::hint::rank, |
my $name=$names[$pick]; |
$parstack,$safeeval); |
push @{ $Apache::response::foilgroup{'names'} }, $name; |
|
$Apache::response::foilgroup{"$name.value"} = |
|
$Apache::response::conceptgroup{"$name.value"}; |
|
$Apache::response::foilgroup{"$name.text"} = |
|
$Apache::response::conceptgroup{"$name.text"}; |
|
$Apache::response::foilgroup{"$name.location"} = |
|
$Apache::response::conceptgroup{"$name.location"}; |
|
my $concept = &Apache::lonxml::get_param('concept',$parstack, |
|
$safeeval); |
|
$Apache::response::foilgroup{"$name.concept"} = $concept; |
|
&Apache::lonxml::debug("Selecting $name in $concept"); |
|
if ($target eq 'web' || $target eq 'tex') { |
|
my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]"; |
|
push(@{ $Apache::hint::rank{"$part_id.concepts"} }, |
|
$concept); |
|
$Apache::hint::rank{"$part_id.concept.$concept"}= |
|
$Apache::response::conceptgroup{'names'}; |
|
} |
|
} |
|
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result=&Apache::edit::end_table(); |
$result=&Apache::edit::end_table(); |
} |
} |
Line 381 sub insert_conceptgroup {
|
Line 400 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' || $target eq 'tex') { |
if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { |
&Apache::lonxml::startredirection; |
&Apache::lonxml::startredirection; |
|
if ($target eq 'analyze') { |
|
&Apache::response::check_if_computed($token,$parstack,$safeeval,'value'); |
|
} |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result=&Apache::edit::tag_start($target,$token,"Foil"); |
$result=&Apache::edit::tag_start($target,$token,"Foil"); |
my $level='-2'; |
my $level='-2'; |
Line 409 sub end_foil {
|
Line 431 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' || $target eq 'tex') { |
if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { |
$text=&Apache::lonxml::endredirection; |
$text=&Apache::lonxml::endredirection; |
} |
} |
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') { |
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 ($target eq 'tex' && $Apache::lonhomework::type eq 'exam') { |
|
$text='\vskip 5mm $\triangleright$ '.$text; |
|
} |
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); |
my $location =&Apache::lonxml::get_param('location',$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 eq "") { |
|
&Apache::lonxml::warning("Foils without names exist. This can cause problems to malfunction."); |
|
$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})) { |
|
&Apache::lonxml::error(&mt("Foil name <b><tt>[_1]</tt></b> appears more than once. Foil names need to be unique.",$name)); |
|
} |
|
$Apache::response::foilnames{$name}++; |
|
my $location =&Apache::lonxml::get_param('location',$parstack, |
|
$safeeval); |
if ( $Apache::rankresponse::conceptgroup |
if ( $Apache::rankresponse::conceptgroup |
&& !&Apache::response::showallfoils() ) { |
&& !&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; |
if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') { |
$Apache::response::conceptgroup{"$name.text"} = $text; |
$Apache::response::conceptgroup{"$name.text"} = ' $\triangleright$ '.$text; |
|
} else { |
|
$Apache::response::conceptgroup{"$name.text"} = $text; |
|
} |
|
$Apache::response::conceptgroup{"$name.location"} = $location; |
$Apache::response::conceptgroup{"$name.location"} = $location; |
} 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 ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') { |
$Apache::response::foilgroup{"$name.text"} = $text; |
$Apache::response::foilgroup{"$name.text"} = '\vskip 5 mm $\triangleright$ '.$text; |
|
} else { |
|
if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') { |
|
$Apache::response::foilgroup{"$name.text"} = ' $\triangleright$ '.$text; |
|
} else { |
|
$Apache::response::foilgroup{"$name.text"} = $text; |
|
} |
|
} |
|
$Apache::response::foilgroup{"$name.location"} = $location; |
$Apache::response::foilgroup{"$name.location"} = $location; |
} |
} |
} |
} |