--- loncom/homework/rankresponse.pm 2007/10/08 09:22:50 1.54 +++ loncom/homework/rankresponse.pm 2014/05/05 17:40:54 1.71 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # rank style response # -# $Id: rankresponse.pm,v 1.54 2007/10/08 09:22:50 foxr Exp $ +# $Id: rankresponse.pm,v 1.71 2014/05/05 17:40:54 bisitz Exp $ # Copyright Michigan State University Board of Trustees # # This file is part of the LearningOnline Network with CAPA (LON-CAPA). @@ -30,6 +30,8 @@ use strict; use HTML::Entities(); use Apache::optionresponse(); use Apache::lonlocal; +use Apache::lonxml; +use Apache::lonnet; BEGIN { &Apache::lonxml::register('Apache::rankresponse',('rankresponse')); @@ -48,15 +50,17 @@ sub start_rankresponse { if ($target eq 'meta') { $result=&Apache::response::meta_package_write('rankresponse'); } 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(); + $result.=&Apache::edit::start_table($token) + .''.&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') { @@ -66,6 +70,7 @@ sub start_rankresponse { 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"} = 'rankresponse'; push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id); push (@{ $Apache::lonhomework::analyze{"$part_id.bubble_lines"} }, 1); @@ -91,7 +96,7 @@ sub start_foilgroup { my $result; %Apache::response::foilgroup=(); $Apache::rankresponse::conceptgroup=0; - &Apache::response::pushrandomnumber(); + &Apache::response::pushrandomnumber(undef,$target); return $result; } @@ -120,8 +125,19 @@ sub end_foilgroup { "$Apache::inputtags::part.$Apache::inputtags::response[-1]"; $Apache::lonhomework::analyze{"$part_id.tol"}=$tol; } - &Apache::lonxml::increment_counter(&getfoilcounts($max), - $Apache::inputtags::part); + my $part = $Apache::inputtags::part; + my $id = $Apache::inputtags::response[-1]; + 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(); } @@ -170,8 +186,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; @@ -220,8 +239,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; @@ -234,7 +279,6 @@ sub grade_response { } else { $ignored++; } - $temp++; } my $malformed=&check_response_order(%responsehash); my $part=$Apache::inputtags::part; @@ -258,12 +302,26 @@ sub grade_response { $ad='MISSING_ANSWER'; } } - if ($Apache::lonhomework::type eq 'survey' && - ($ad eq 'INCORRECT' || $ad eq 'EXACT_ANS') ) { - $ad='SUBMITTED'; + if (($ad eq 'INCORRECT' || $ad eq 'EXACT_ANS')) { + if ($Apache::lonhomework::type eq 'survey') { + $ad='SUBMITTED'; + } elsif ($Apache::lonhomework::type eq 'surveycred') { + $ad='SUBMITTED_CREDIT'; + } elsif ($Apache::lonhomework::type eq 'anonsurvey') { + $ad='ANONYMOUS'; + } elsif ($Apache::lonhomework::type eq 'anonsurveycred') { + $ad='ANONYMOUS_CREDIT'; + } else { + $Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}=$gradestr; + } } else { $Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}=$gradestr; } + if ($Apache::lonhomework::type eq 'randomizetry') { + if ($Apache::lonhomework::type eq 'randomizetry') { + $Apache::lonhomework::results{"resource.$part.$id.foilorder"} = &Apache::lonnet::array2str(@whichfoils); + } + } $Apache::lonhomework::results{"resource.$part.$id.submission"}= $responsestr; $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad; @@ -277,8 +335,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 = @@ -310,28 +371,74 @@ 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 ($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; - foreach my $name (@whichfoils) { + 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 \\\\' ; + } + foreach my $name (@whichfoils) { my $lastopt=$lastresponse{$name}; my $optionlist=''; - if ($target ne 'tex') {$optionlist="\n";} + if ($target ne 'tex') { + $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; + $optionlist = &Apache::lonxml::print_pdf_start_combobox($fieldname); + } my $option; foreach $option (@whichopt) { if ($option eq $lastopt) { - if ($target ne 'tex') {$optionlist.="\n";} + if ($target ne 'tex' ) { + $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";} - } + if ($target ne 'tex') { + $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"; - } else { + } elsif ($env{'form.pdfFormFields'} eq 'yes') { + #do nothing + } else { $optionlist=' '.$temp.' '.$optionlist.' '; } my $text=$Apache::response::foilgroup{$name.'.text'}; @@ -347,20 +454,46 @@ sub displayfoils { } } else { if ($Apache::lonhomework::type eq 'exam') { - $result.='\vskip 0 mm '.$text.' \vskip 0 mm '."\n"; - $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++; + 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}'.$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 { - $result.=' \vskip 0mm \framebox[5 mm][s]{\tiny\strut} '.$text."\n"; + if($env{'form.pdfFormFields'} ne 'yes') { + $result.=' \vskip 0mm \framebox[5 mm][s]{\tiny\strut} '.$text."\n"; + } else { + $result.= $optionlist.' '. &Apache::lonxml::print_pdf_end_combobox($text).'\strut \\\\'; + } } } $temp++; } } 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']); + 'submissiongrading'], + $questiontype); } if ($target ne 'tex') {$result.="
";} else {$result.=' \vskip 0 mm ';} return $result; @@ -471,12 +604,12 @@ sub end_foil { my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval); &Apache::lonxml::debug("Got a name of :$name:"); if ($name eq "") { - &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,