--- loncom/homework/matchresponse.pm 2009/04/16 15:04:58 1.76 +++ loncom/homework/matchresponse.pm 2010/12/19 00:54:20 1.81 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Full matching style response # -# $Id: matchresponse.pm,v 1.76 2009/04/16 15:04:58 onken Exp $ +# $Id: matchresponse.pm,v 1.81 2010/12/19 00:54:20 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -180,7 +180,7 @@ sub end_itemgroup { $i++; } $table.=' \end{description} \strut '; - if ($Apache::lonhomework::type eq 'exam') {$table.='\vskip -13 mm \strut ';} + if ($Apache::lonhomework::type eq 'exam') {$table.='\vskip -13 mm \strut ';} $Apache::matchresponse::itemtable{'display'}=$table; $Apache::lonxml::post_evaluate=0; } @@ -252,7 +252,7 @@ sub start_foilgroup { my $result; %Apache::response::foilgroup=(); $Apache::matchresponse::conceptgroup=0; - &Apache::response::pushrandomnumber(); + &Apache::response::pushrandomnumber(undef,$target); if ($target eq 'edit') { $result.=&Apache::edit::start_table($token) .''.&mt('Collection Of Foils').'' @@ -354,6 +354,7 @@ sub grade_response { if (!&Apache::response::submitted()) { return; } my %responsehash; my %grade; + my %answerhash; my ($temp,$right,$wrong,$ignored)=(1,0,0,0); my %letter_name_map; if (defined(%{ $Apache::response::itemgroup{'letter_name_map'} })) { @@ -366,6 +367,9 @@ sub grade_response { push(@items,$response); my $responsename = $letter_name_map{$response}; my $value=$Apache::response::foilgroup{$name.'.value'}; + if ($Apache::lonhomework::type eq 'randomizetry') { + $answerhash{$name} = $value; + } if ( $response =~ /[^\s]/) { $responsehash{$name}=$responsename; &Apache::lonxml::debug("submitted a $response($responsename) for $value
\n"); @@ -392,9 +396,24 @@ sub grade_response { $itemstr; $Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}= $gradestr; - if ($Apache::lonhomework::type eq 'survey') { + if ($Apache::lonhomework::type eq 'randomizetry') { + $Apache::lonhomework::results{"resource.$part.$id.foilorder"} = &Apache::lonnet::array2str(@whichfoils); + } + if (($Apache::lonhomework::type eq 'survey') || + ($Apache::lonhomework::type eq 'surveycred') || + ($Apache::lonhomework::type eq 'anonsurvey') || + ($Apache::lonhomework::type eq 'anonsurveycred')) { if ($ignored == 0) { - my $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='SUBMITTED'; + my $ad; + if ($Apache::lonhomework::type eq 'anonsurvey') { + $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='ANONYMOUS'; + } elsif ($Apache::lonhomework::type eq 'anonsurveycred') { + $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='ANONYMOUS_CREDIT'; + } elsif ($Apache::lonhomework::type eq 'surveycred') { + $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='SUBMITTED_CREDIT'; + } else { + $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='SUBMITTED'; + } &Apache::response::handle_previous(\%previous,$ad); } elsif ($wrong==0 && $right==0) { } else { @@ -500,7 +519,18 @@ sub displayfoils { my $temp=1; my $id=$Apache::inputtags::response[-1]; my $part=$Apache::inputtags::part; - my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"}; + my ($lastresponse,$newvariation); + if ((($Apache::lonhomework::history{"resource.$part.type"} eq 'randomizetry') || + ($Apache::lonhomework::type eq 'randomizetry')) && + ($Apache::inputtags::status[-1] eq 'CAN_ANSWER')) { + if ($env{'form.'.$part.'.rndseed'} ne + $Apache::lonhomework::history{"resource.$part.rndseed"}) { + $newvariation = 1; + } + } + unless ((($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurvey') || ($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurveycred') && (defined($env{'form.grade_symb'}))) || $newvariation) { + $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"}; + } my %lastresponse=&Apache::lonnet::str2hash($lastresponse); my @alphabet=('A'..'Z'); my @used_letters=sort(keys(%letter_name_map)); @@ -518,6 +548,7 @@ sub displayfoils { my $fieldname = $env{'request.symb'} . '&part_'. $Apache::inputtags::part .'&matchresponse'. '&HWVAL_' . $Apache::inputtags::response['-1'] . ':' . $temp . '&submit_' . $Apache::inputtags::part . '&'; $optionlist = &Apache::lonxml::print_pdf_start_combobox($fieldname); } else { + $optionlist='\framebox[10 mm][s]{\tiny\strut}'; } } @@ -526,16 +557,18 @@ sub displayfoils { foreach $option (@used_letters) { if ($option eq $last_letter) { if ($target ne 'tex') { - $optionlist.="\n"; + $optionlist.="\n"; } elsif ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes' - && $Apache::inputtags::status['-1'] eq 'CAN_ANSWER') { + && $Apache::inputtags::status['-1'] eq 'CAN_ANSWER' + && $Apache::lonhomework::type ne 'exam') { $optionlist .= &Apache::lonxml::print_pdf_add_combobox_option($option); } } else { if ($target ne 'tex') { $optionlist.="\n"; } elsif ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes' - && $Apache::inputtags::status['-1'] eq 'CAN_ANSWER') { + && $Apache::inputtags::status['-1'] eq 'CAN_ANSWER' + && $Apache::lonhomework::type ne 'exam') { $optionlist .= &Apache::lonxml::print_pdf_add_combobox_option($option); } } @@ -580,17 +613,17 @@ sub displayfoils { # Note that if left or right positioned, we must # confine the bubbles to righttabsize: # - if ($Apache::lonhomework::type eq 'exam' && $env{'form.pdfFormFields'} ne 'yes') { + if ($Apache::lonhomework::type eq 'exam') { $question.=' '.$optionlist.$text."\n"; my @emptyItems = (); for (my $i=0;$i<=$#used_letters;$i++) {push @emptyItems, ' ';} $question.='\vskip -1 mm\noindent\begin{list}{}{\setlength{\listparindent}{0mm}\setlength{\leftmargin}{2mm}}' .'\item \hskip -3mm \textbf{'.$internal_counter.'}'; if (&itemdisplay('left') || &itemdisplay('right')) { - $question .= &Apache::optionresponse::bubbles(\@used_letters,\@emptyItems, "", $righttabsize); + $question .= '\vskip -4 mm' . &Apache::optionresponse::bubbles(\@used_letters,\@emptyItems, "", $righttabsize); } else { - $question .= &Apache::optionresponse::bubbles(\@used_letters,\@emptyItems); + $question .= '\vskip -4 mm' . &Apache::optionresponse::bubbles(\@used_letters,\@emptyItems); } $question .= '\end{list} \vskip -8 mm \strut '; $internal_counter++; @@ -634,10 +667,15 @@ sub displayfoils { } } if ($target eq 'web') { + my $questiontype; + if ($Apache::lonhomework::type eq 'randomizetry') { + $questiontype = $Apache::lonhomework::type; + } &Apache::response::setup_prior_tries_hash(\&format_prior_answer, [\@whichfoils, 'submissiongrading', - 'submissionitems']); + 'submissionitems'], + $questiontype); } if ($target ne 'tex') {$result.="
";} else {$result.=' \\\\ ';} return $result; @@ -758,11 +796,13 @@ sub end_foil { $safeeval); if ( $Apache::matchresponse::conceptgroup && !&Apache::response::showallfoils() ) { + push @{ $Apache::response::conceptgroup{'names'} }, $name; $Apache::response::conceptgroup{"$name.value"} = $value; $Apache::response::conceptgroup{"$name.text"} = $text; $Apache::response::conceptgroup{"$name.location"} = $location; } else { + push @{ $Apache::response::foilgroup{'names'} }, $name; $Apache::response::foilgroup{"$name.value"} = $value; $Apache::response::foilgroup{"$name.text"} = $text;