--- loncom/homework/matchresponse.pm 2007/08/29 10:07:42 1.65 +++ loncom/homework/matchresponse.pm 2010/04/27 14:11:17 1.80 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Full matching style response # -# $Id: matchresponse.pm,v 1.65 2007/08/29 10:07:42 foxr Exp $ +# $Id: matchresponse.pm,v 1.80 2010/04/27 14:11:17 onken Exp $ # # Copyright Michigan State University Board of Trustees # @@ -33,6 +33,7 @@ use Math::Random(); use Apache::optionresponse(); use Apache::lonlocal; use Apache::lonnet; +use Apache::lonxml; BEGIN { &Apache::lonxml::register('Apache::matchresponse',('matchresponse')); @@ -53,14 +54,16 @@ sub start_matchresponse { $result=&Apache::response::meta_package_write('matchresponse'); } elsif ($target eq 'edit' ) { $result.=&Apache::edit::start_table($token). - ''.&Apache::lonxml::description($token)."Delete:". - &Apache::edit::deletelist($target,$token) - ." ".&Apache::edit::end_row() - .&Apache::edit::start_spanning_row(); + ''.&Apache::lonxml::description($token).'' + .''.&mt('Delete?').' ' + .&Apache::edit::deletelist($target,$token) + .'' + .' '.&Apache::edit::end_row() + .&Apache::edit::start_spanning_row(); $result.= &Apache::edit::text_arg('Max Number Of Shown Foils:','max',$token,'4'). - &Apache::edit::select_arg('Randomize Foil Order','randomize', + &Apache::edit::select_arg('Randomize Foil Order:','randomize', ['yes','no'],$token). &Apache::edit::end_row().&Apache::edit::start_spanning_row()."\n"; } elsif ($target eq 'modified') { @@ -70,8 +73,9 @@ sub start_matchresponse { if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } } elsif ($target eq 'analyze') { my $part_id="$Apache::inputtags::part.$id"; + $Apache::lonhomework::analyze{"$part_id.type"} = 'matchresponse'; push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id); - push (@{ $Apache::lonhomework::anaylze{"$part_id.bubble_lines"} }, + push (@{ $Apache::lonhomework::analyze{"$part_id.bubble_lines"} }, 1); } return $result; @@ -99,12 +103,12 @@ sub start_itemgroup { if ($target eq 'edit') { $result=&Apache::edit::tag_start($target,$token); $result.=&Apache::edit::select_arg('Randomize Order:','randomize', - ['yes','no'],$token); + ['yes','no'],$token).' 'x 3; $result.=&Apache::edit::select_arg('Items Display Location:', 'location', ['top','bottom','left','right'], - $token); - $result.=&Apache::edit::select_arg('Items Display Directection:', + $token).' 'x 3; + $result.=&Apache::edit::select_arg('Items Display Direction:', 'direction', ['vertical','horizontal'], $token); @@ -176,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; } @@ -194,7 +198,8 @@ sub start_item { $result=&Apache::edit::tag_start($target,$token,"Item"); $result.=&Apache::edit::text_arg('Name:','name',$token); if ($randomize ne 'no') { - $result.=&Apache::edit::select_arg('Location:','location', + $result.=' 'x 3 . + &Apache::edit::select_arg('Location:','location', ['random','top','bottom'], $token); } @@ -250,9 +255,11 @@ sub start_foilgroup { &Apache::response::pushrandomnumber(); if ($target eq 'edit') { $result.=&Apache::edit::start_table($token) - ."Collection Of FoilsDelete:" + .''.&mt('Collection Of Foils').'' + .''.&mt('Delete?') .&Apache::edit::deletelist($target,$token) - ." ".&Apache::edit::end_row() + .'' + .' '.&Apache::edit::end_row() .&Apache::edit::start_spanning_row()."\n"; } return $result; @@ -261,6 +268,9 @@ sub start_foilgroup { sub end_foilgroup { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result; + my $part = $Apache::inputtags::part; + my $response_id = $Apache::inputtags::response[-1]; + 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 $randomize = &Apache::lonxml::get_param('randomize',$parstack, @@ -278,7 +288,12 @@ sub end_foilgroup { ['text','value','location']); #FIXME need to store options in some way } - &Apache::lonxml::increment_counter(&getfoilcounts($max)); + &Apache::lonxml::increment_counter(&getfoilcounts($max), + "$part.$response_id"); + if ($target eq 'analyze') { + &Apache::lonhomework::set_bubble_lines(); + } + } elsif ($target eq 'edit') { $result=&Apache::edit::end_table(); } @@ -377,9 +392,21 @@ sub grade_response { $itemstr; $Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}= $gradestr; - if ($Apache::lonhomework::type eq 'survey') { + 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 { @@ -485,7 +512,10 @@ 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; + unless ((($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurvey') || ($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurveycred')) && (defined($env{'form.grade_symb'}))) { + $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)); @@ -498,15 +528,34 @@ sub displayfoils { $optionlist="\n"; } else { if ($Apache::lonhomework::type ne 'exam') { - $optionlist='\framebox[5 mm][s]{\tiny\strut}'; - } + if($env{'form.pdfFormFields'} eq 'yes' + && $Apache::inputtags::status['-1'] eq 'CAN_ANSWER') { + 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}'; + } + } } my $option; foreach $option (@used_letters) { if ($option eq $last_letter) { - if ($target ne 'tex') {$optionlist.="\n";} + if ($target ne 'tex') { + $optionlist.="\n"; + } elsif ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes' + && $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";} + if ($target ne 'tex') { + $optionlist.="\n"; + } elsif ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes' + && $Apache::inputtags::status['-1'] eq 'CAN_ANSWER' + && $Apache::lonhomework::type ne 'exam') { + $optionlist .= &Apache::lonxml::print_pdf_add_combobox_option($option); + } } } if ($target ne 'tex' && $Apache::lonhomework::type ne 'exam') { @@ -556,15 +605,20 @@ sub displayfoils { $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++; } else { - $question.=' '.$optionlist.$text.'\strut\\\\\strut '."\n"; + if($env{'form.pdfFormFields'} eq 'yes' + && $Apache::inputtags::status['-1'] eq 'CAN_ANSWER') { + $question .= " $optionlist ". &Apache::lonxml::print_pdf_end_combobox($text).'\strut'; + } else { + $question.=' '.$optionlist.$text.'\strut\\\\\strut '."\n"; + } } } $temp++; @@ -710,23 +764,25 @@ sub end_foil { my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval); &Apache::lonxml::debug("Got a name of :$name:"); if (!$name) { - &Apache::lonxml::warning("Foils without names exist. This can cause problems to malfunction."); + &Apache::lonxml::warning(&mt('Foils without names exist. This can cause problems to malfunction.')); $name=$Apache::lonxml::curdepth; } &Apache::lonxml::debug("Using a name of :$name:"); if (defined($Apache::response::foilnames{$name})) { - &Apache::lonxml::error(&mt("Foil name [_1] appears more than once. Foil names need to be unique.",$name)); + &Apache::lonxml::error(&mt("Foil name [_1] 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::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;