--- loncom/homework/rankresponse.pm 2010/12/19 00:48:50 1.64 +++ loncom/homework/rankresponse.pm 2025/01/27 14:46:20 1.76 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # rank style response # -# $Id: rankresponse.pm,v 1.64 2010/12/19 00:48:50 raeburn Exp $ +# $Id: rankresponse.pm,v 1.76 2025/01/27 14:46:20 raeburn Exp $ # Copyright Michigan State University Board of Trustees # # This file is part of the LearningOnline Network with CAPA (LON-CAPA). @@ -51,7 +51,8 @@ sub start_rankresponse { $result=&Apache::response::meta_package_write('rankresponse'); } elsif ($target eq 'edit' ) { $result.=&Apache::edit::start_table($token) - .''.&Apache::lonxml::description($token).'' + .''.&Apache::loncommon::insert_folding_button() + .&Apache::lonxml::description($token).'' .''.&mt('Delete?').' ' .&Apache::edit::deletelist($target,$token) .'' @@ -127,8 +128,17 @@ sub end_foilgroup { } my $part = $Apache::inputtags::part; my $id = $Apache::inputtags::response[-1]; - &Apache::lonxml::increment_counter(&getfoilcounts($max), - "$part.$id"); + my ($numrows,$bubbles_per_row); + if (($target eq 'tex') && ($Apache::lonhomework::type eq 'exam')) { + my (@whichfoils)=&whichfoils($max,$randomize); + ($numrows,$bubbles_per_row) = + &Apache::optionresponse::getnumrows(scalar(@whichfoils)); + } + if ($numrows < 1) { + $numrows = 1; + } + my $increment = &getfoilcounts($max) * $numrows; + &Apache::lonxml::increment_counter($increment,"$part.$id"); if ($target eq 'analyze') { &Apache::lonhomework::set_bubble_lines(); } @@ -177,8 +187,11 @@ sub get_correct_order { sub displayanswers { my ($max,$randomize,$tol,@opt)=@_; - if (!defined(@{ $Apache::response::foilgroup{'names'} })) { return; } - my @names = @{ $Apache::response::foilgroup{'names'} }; + my @names; + if (ref($Apache::response::foilgroup{'names'}) eq 'ARRAY') { + @names = @{ $Apache::response::foilgroup{'names'} }; + } + return if (!@names); my @whichfoils = &whichfoils($max,$randomize); my @correctorder=&get_correct_order($tol,@whichfoils); my $result; @@ -227,8 +240,34 @@ sub grade_response { my %grade; my ($temp,$right,$wrong,$ignored)=(1,0,0,0); my @correctorder=&get_correct_order($tol,@whichfoils); + my ($numrows,$bubbles_per_row); + if ($Apache::lonhomework::scantronmode) { + my $numitems = scalar(@whichfoils); + ($numrows,$bubbles_per_row) = + &Apache::optionresponse::getnumrows($numitems); + } + if ($numrows < 1) { + $numrows = 1; + } + foreach my $name (@whichfoils) { - my $response = &Apache::response::getresponse($temp,'A is 1'); + my $response; + if ($numrows > 1) { + my $num = $temp; + my $totalnum; + for (my $i=0; $i<$numrows; $i++) { + my $item = &Apache::response::getresponse($num,'A is 1'); + if ($item =~ /^\d+$/) { + $totalnum = $i*$bubbles_per_row + $item; + } + $num ++; + } + $response = $totalnum; + $temp += $numrows; + } else { + $response = &Apache::response::getresponse($temp,'A is 1'); + $temp ++; + } my $value=shift(@correctorder); if ( $response =~ /[^\s]/) { $responsehash{$name}=$response; @@ -241,7 +280,6 @@ sub grade_response { } else { $ignored++; } - $temp++; } my $malformed=&check_response_order(%responsehash); my $part=$Apache::inputtags::part; @@ -298,8 +336,11 @@ sub format_prior_answer { my %grading =&Apache::lonnet::str2hash($other_data->[1]); my $output; foreach my $name (@{ $foil_order }) { - next if (!defined($lastresponse{$name})); - $output .= ''.$lastresponse{$name}.''; + if (defined($lastresponse{$name})) { + $output .= ''.&HTML::Entities::encode($lastresponse{$name},'<>&"').''; + } else { + $output .= ' '; + } } return if (!defined($output)); $output = @@ -321,7 +362,7 @@ sub displayfoils { my $text=$Apache::response::foilgroup{$name.'.text'}; my $value=shift(@correctorder); if ($target eq 'web') { - $result.='
'.$value.': '.$text; + $result.='
'.$value.': '.$text.'
'; } else { $result.=' \strut\\\\\strut '.$value.':'.$text; } @@ -340,12 +381,28 @@ sub displayfoils { $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"}; + unless ($newvariation) { + if ((($env{'form.grade_username'} eq '') && ($env{'form.grade_domain'} eq '')) || + (($env{'form.grade_username'} eq $env{'user.name'}) && + ($env{'form.grade_domain'} eq $env{'user.domain'}))) { + $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"}; + } else { + unless (($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurvey') || + ($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurveycred')) { + $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"}; + } + } } my %lastresponse=&Apache::lonnet::str2hash($lastresponse); my @alp = splice @alphabet, 0, $#whichopt + 1; my $internal_counter=$Apache::lonxml::counter; + my ($numrows,$bubbles_per_row); + if (($target eq 'tex') && ($Apache::lonhomework::type eq 'exam')) { + ($numrows,$bubbles_per_row) = + &Apache::optionresponse::getnumrows(scalar(@alp)); + } else { + $numrows = 1; + } if($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes') { $result .= '\strut \\\\ \strut \\\\' ; } @@ -353,7 +410,7 @@ sub displayfoils { my $lastopt=$lastresponse{$name}; my $optionlist=''; if ($target ne 'tex') { - $optionlist = "\n"; + $optionlist = "\n"; } if ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes') { my $fieldname = $env{'request.symb'}.'&part_'.$Apache::inputtags::part.'&rankresponse'.'&HWVAL_'.$Apache::inputtags::response['-1'].':'.$temp; @@ -363,20 +420,20 @@ sub displayfoils { foreach $option (@whichopt) { if ($option eq $lastopt) { if ($target ne 'tex' ) { - $optionlist.="\n"; + $optionlist.="\n"; } elsif ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes') { $optionlist .= &Apache::lonxml::print_pdf_add_combobox_option($option); } } else { if ($target ne 'tex') { - $optionlist.="\n"; + $optionlist.="\n"; } elsif ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes') { $optionlist .= &Apache::lonxml::print_pdf_add_combobox_option($option); } } } if ($target ne 'tex' && $Apache::lonhomework::type ne 'exam') { - $optionlist='\n"; @@ -387,23 +444,39 @@ sub displayfoils { } my $text=$Apache::response::foilgroup{$name.'.text'}; if ($target ne 'tex') { + $result .= '
'; if ($Apache::lonhomework::type ne 'exam') { - $result.='
'.$optionlist.$text."\n"; + $result.=$optionlist.$text."\n"; } else { - $result.='
'.$text."\n"; + $result.=$text."\n"; } if ($Apache::lonhomework::type eq 'exam') { my @values=(1..scalar(@whichopt)); $result.=&Apache::optionresponse::webbubbles(\@values,\@whichopt,$temp,$lastopt); } + $result .= '
'; } else { if ($Apache::lonhomework::type eq 'exam') { + my $itemlabel; + if ($numrows == 1) { + $itemlabel = '\item[\textbf{'.$internal_counter.'}]'; + } else { + my $linetext; + for (my $i=0; $i<$numrows; $i++) { + $linetext .= $internal_counter+$i.', '; + } + $linetext =~ s/,\s$//; + $itemlabel = '\item[\small {\textbf{'.$linetext.'}}]'. + ' {\footnotesize '. + &mt('(Bubble once in [_1] lines)',$numrows). + '} \hspace*{\fill} \\\\'; + } $result .= '\vskip 0 mm '.$text.' \vskip 0 mm '."\n"; $result .= '\vskip -1 mm'; - $result .= '\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]'; - $result .= &Apache::optionresponse::bubbles(\@alp,\@whichopt,'rankresponse'); - $result .= '\end{enumerate} \vskip -8 mm \strut '; - $internal_counter++; + $result .= '\begin{enumerate}'.$itemlabel; + $result .= &Apache::optionresponse::bubbles(\@alp,\@whichopt,'rankresponse',undef,$numrows,$bubbles_per_row,$internal_counter); + $result .= '\end{enumerate} \vskip -8 mm \strut '; + $internal_counter += $numrows; } else { if($env{'form.pdfFormFields'} ne 'yes') { $result.=' \vskip 0mm \framebox[5 mm][s]{\tiny\strut} '.$text."\n";