--- loncom/homework/matchresponse.pm 2008/12/11 00:56:20 1.73
+++ loncom/homework/matchresponse.pm 2011/11/29 13:24:38 1.85
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Full matching style response
#
-# $Id: matchresponse.pm,v 1.73 2008/12/11 00:56:20 raeburn Exp $
+# $Id: matchresponse.pm,v 1.85 2011/11/29 13:24:38 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -30,6 +30,7 @@ package Apache::matchresponse;
use strict;
use HTML::Entities();
use Math::Random();
+use Apache::inputtags();
use Apache::optionresponse();
use Apache::lonlocal;
use Apache::lonnet;
@@ -131,7 +132,11 @@ sub end_itemgroup {
my $result;
if ($target eq 'edit') { $result=&Apache::edit::end_table(); }
- if (!defined(@{ $Apache::response::itemgroup{'names'} })) { return; }
+ if (ref($Apache::response::itemgroup{'names'}) eq 'ARRAY') {
+ if(!@{ $Apache::response::itemgroup{'names'} }) { return; }
+ } else {
+ return;
+ }
my @names=@{ $Apache::response::itemgroup{'names'} };
my $randomize =&Apache::lonxml::get_param('randomize',$parstack,$safeeval);
if ($randomize ne 'no' ) {
@@ -173,14 +178,36 @@ sub end_itemgroup {
} elsif ($target eq 'tex') {
my $table=' \begin{description}\setlength{\leftmargin}{2em}\setlength{\labelwidth}{1em}\setlength{\itemsep}{0.5pt plus1pt minus2pt}\setlength{\listparindent}{0em} ';
my $i=0;
+ my ($numrows,$bubbles_per_row);
+ if ($Apache::lonhomework::type eq 'exam') {
+ ($numrows,$bubbles_per_row) =
+ &Apache::optionresponse::getnumrows(scalar(@names));
+ } else {
+ $numrows = 1;
+ }
foreach my $name (@names) {
# $Apache::response::itemgroup{$name.'.text'}=~s/\$\$/\$/g;
- $table.='\item['.$alphabet[$i].'] '.
+ my $item;
+ if (($numrows > 1) && ($bubbles_per_row > 0)) {
+ my $num = 1+int($i/$bubbles_per_row);
+ my $idx = int($i % $bubbles_per_row);
+ if ($idx == 0) {
+ if ($num == 1) {
+ $table .= '\item[\footnotesize {'.&mt('(first line)').'}]';
+ } else {
+ $table .= '\item[\footnotesize {'.&mt('(next line)').'}]';
+ }
+ }
+ $item = $alphabet[$idx];
+ } else {
+ $item = $alphabet[$i];
+ }
+ $table.='\item['.$item.'] '.
$Apache::response::itemgroup{$name.'.text'};
$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 +279,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)
.'<tr><td>'.&mt('Collection Of Foils').'</td>'
@@ -288,8 +315,20 @@ sub end_foilgroup {
['text','value','location']);
#FIXME need to store options in some way
}
- &Apache::lonxml::increment_counter(&getfoilcounts($max),
- "$part.$response_id");
+ my ($numrows,$bubbles_per_row);
+ if (($target eq 'tex') && ($Apache::lonhomework::type eq 'exam')) {
+ my $numitems;
+ if (ref($Apache::response::itemgroup{'names'}) eq 'ARRAY') {
+ $numitems = scalar(@{ $Apache::response::itemgroup{'names'} });
+ ($numrows,$bubbles_per_row) =
+ &Apache::optionresponse::getnumrows($numitems);
+ }
+ }
+ if ($numrows < 1) {
+ $numrows = 1;
+ }
+ my $increment = &getfoilcounts($max) * $numrows;
+ &Apache::lonxml::increment_counter($increment,"$part.$response_id");
if ($target eq 'analyze') {
&Apache::lonhomework::set_bubble_lines();
}
@@ -311,16 +350,22 @@ sub whichfoils {
sub displayanswers {
my ($max,$randomize,@opt)=@_;
- if (!defined(@{ $Apache::response::foilgroup{'names'} })) { return; }
+ if (ref($Apache::response::foilgroup{'names'}) eq 'ARRAY') {
+ if (!@{ $Apache::response::foilgroup{'names'} }) { return; }
+ } else {
+ return;
+ }
my @names = @{ $Apache::response::foilgroup{'names'} };
my @whichfoils = &Apache::response::whichorder(&getfoilcounts($max),
$randomize,
&Apache::response::showallfoils(),
\%Apache::response::foilgroup);
my %name_letter_map;
- if (defined(%{ $Apache::response::itemgroup{'name_letter_map'} })) {
- %name_letter_map=
- %{ $Apache::response::itemgroup{'name_letter_map'} };
+ if (ref($Apache::response::itemgroup{'name_letter_map'}) eq 'HASH') {
+ if (%{$Apache::response::itemgroup{'name_letter_map'}}) {
+ %name_letter_map=
+ %{ $Apache::response::itemgroup{'name_letter_map'} };
+ }
}
my $result;
if ($Apache::lonhomework::type eq 'exam') {
@@ -354,18 +399,57 @@ 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'} })) {
- %letter_name_map=
- %{ $Apache::response::itemgroup{'letter_name_map'} };
+ if (ref($Apache::response::itemgroup{'letter_name_map'}) eq 'HASH') {
+ if (%{$Apache::response::itemgroup{'letter_name_map'}}) {
+ %letter_name_map=
+ %{ $Apache::response::itemgroup{'letter_name_map'} };
+ }
}
my @items;
+ my $numitems = scalar(@{ $Apache::response::itemgroup{'names'} });
+ my ($numrows,$bubbles_per_row);
+ if ($Apache::lonhomework::scantronmode) {
+ my $numitems = scalar(@{ $Apache::response::itemgroup{'names'} });
+ ($numrows,$bubbles_per_row) =
+ &Apache::optionresponse::getnumrows($numitems);
+ }
+ if ($numrows < 1) {
+ $numrows = 1;
+ }
+ my @alphabet=('A'..'Z');
+ my %nums_from_letters;
+ for (my $i=0; $i<@alphabet; $i++) {
+ $nums_from_letters{$alphabet[$i]} = $i;
+ }
foreach my $name (@whichfoils) {
- my $response = &Apache::response::getresponse($temp,'letter');
+ my $response;
+ if ($numrows > 1) {
+ my $num = $temp;
+ my $totalnum;
+ for (my $i=0; $i<$numrows; $i++) {
+ my $item = &Apache::response::getresponse($num,'letter');
+ if ($item =~ /^\w$/) {
+ $totalnum = $i*$bubbles_per_row + $nums_from_letters{$item};
+ }
+ $num ++;
+ }
+ if ($totalnum =~ /^\d+$/) {
+ $response = $alphabet[$totalnum];
+ }
+ $temp += $numrows;
+ } else {
+ $response = &Apache::response::getresponse($temp,'letter');
+ $temp ++;
+ }
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<br />\n");
@@ -377,9 +461,9 @@ sub grade_response {
} else {
$ignored++;
}
- $temp++;
}
my $part=$Apache::inputtags::part;
+ my $nonlenient=&Apache::inputtags::grading_is_nonlenient($part);
my $id = $Apache::inputtags::response['-1'];
my $responsestr=&Apache::lonnet::hash2str(%responsehash);
my $itemstr =&Apache::lonnet::array2str(@items);
@@ -392,43 +476,61 @@ 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 {
my $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='MISSING_ANSWER';
&Apache::response::handle_previous(\%previous,$ad);
}
- } elsif (!$Apache::lonhomework::scantronmode) {
- my $ad;
- if ($wrong==0 && $ignored==0) {
- $ad='EXACT_ANS';
- } elsif ($wrong==0 && $right==0) {
- #nothing submitted
- } else {
- if ($ignored==0) {
- $ad='INCORRECT';
- } else {
- $ad='MISSING_ANSWER';
- }
- }
- $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad;
- &Apache::response::handle_previous(\%previous,$ad);
+ } elsif ($nonlenient) {
+ my $ad;
+ if ($wrong==0 && $ignored==0) {
+ $ad='EXACT_ANS';
+ } elsif ($wrong==0 && $right==0) {
+ #nothing submitted
+ } else {
+ if ($ignored==0) {
+ $ad='INCORRECT';
+ } else {
+ $ad='MISSING_ANSWER';
+ }
+ }
+ $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad;
+ &Apache::response::handle_previous(\%previous,$ad);
} else {
- my $ad;
- if ($wrong==0 && $right==0) {
- #nothing submitted
- } else {
- $ad='ASSIGNED_SCORE';
- $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=
- $ad;
- $Apache::lonhomework::results{"resource.$part.$id.awarded"}=
- $right/(scalar(@whichfoils));
- $Apache::lonhomework::results{"resource.$part.$id.numfoils"}=
- scalar(@whichfoils);
- }
+ my $ad;
+ if ($wrong==0 && $right==0) {
+ #nothing submitted only assign a score if we
+ #need to override a previous grade
+ if (defined($Apache::lonhomework::history{"resource.$part.$id.awarddetail"})) {
+ $ad='ASSIGNED_SCORE';
+ }
+ } else {
+ $ad='ASSIGNED_SCORE';
+ }
+ $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad;
+ $Apache::lonhomework::results{"resource.$part.$id.awarded"}=
+ $right/(scalar(@whichfoils));
+ $Apache::lonhomework::results{"resource.$part.$id.numfoils"}=
+ scalar(@whichfoils);
}
}
@@ -475,14 +577,18 @@ sub displayfoils {
my $part=$Apache::inputtags::part;
my $solved=$Apache::lonhomework::history{"resource.$part.solved"};
my %letter_name_map;
- if (defined(%{ $Apache::response::itemgroup{'letter_name_map'} })) {
- %letter_name_map=
- %{ $Apache::response::itemgroup{'letter_name_map'} };
+ if (ref($Apache::response::itemgroup{'letter_name_map'}) eq 'HASH') {
+ if (%{$Apache::response::itemgroup{'letter_name_map'}}) {
+ %letter_name_map=
+ %{ $Apache::response::itemgroup{'letter_name_map'} };
+ }
}
my %name_letter_map;
- if (defined(%{ $Apache::response::itemgroup{'name_letter_map'} })) {
- %name_letter_map=
- %{ $Apache::response::itemgroup{'name_letter_map'} };
+ if (ref($Apache::response::itemgroup{'name_letter_map'}) eq 'HASH') {
+ if (%{$Apache::response::itemgroup{'name_letter_map'}}) {
+ %name_letter_map=
+ %{ $Apache::response::itemgroup{'name_letter_map'} };
+ }
}
if ( &Apache::response::show_answer() && ($target ne 'tex')) {
foreach my $name (@whichfoils) {
@@ -500,11 +606,29 @@ 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));
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(@used_letters));
+ } else {
+ $numrows = 1;
+ }
foreach my $name (@whichfoils) {
my $lastopt=$lastresponse{$name};
my $last_letter=$name_letter_map{$lastopt};
@@ -513,26 +637,32 @@ sub displayfoils {
$optionlist="<option></option>\n";
} else {
if ($Apache::lonhomework::type ne 'exam') {
- if($env{'form.pdfFormFields'} eq 'yes') {
+ 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.="<option selected=\"on\">$option</option>\n";
- } elsif ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes') {
+ $optionlist.="<option selected=\"selected\">$option</option>\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.="<option>$option</option>\n";
- } elsif ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes') {
+ } 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);
}
}
@@ -577,22 +707,35 @@ 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.'}';
+ .'\item \hskip -3mm ';
+ if ($numrows == 1) {
+ $question .= '\textbf{'.$internal_counter.'}';
+ } else {
+ my $linetext;
+ for (my $i=0; $i<$numrows; $i++) {
+ $linetext .= $internal_counter+$i.', ';
+ }
+ $linetext =~ s/,\s$//;
+ $question .= '\small {\textbf{'.$linetext.'}} '.
+ '\hskip 2 mm {\footnotesize '.
+ &mt('(Bubble once in [_1] lines)',$numrows).
+ '} \vskip 3 mm';
+ }
+ my $max_width;
if (&itemdisplay('left') || &itemdisplay('right')) {
- $question .= &Apache::optionresponse::bubbles(\@used_letters,\@emptyItems, "", $righttabsize);
- }
- else {
- $question .= &Apache::optionresponse::bubbles(\@used_letters,\@emptyItems);
- }
+ $max_width = $righttabsize;
+ }
+ $question .= '\vskip -4 mm' . &Apache::optionresponse::bubbles(\@used_letters,\@emptyItems,'',$max_width,$numrows,$bubbles_per_row,$internal_counter);
$question .= '\end{list} \vskip -8 mm \strut ';
- $internal_counter++;
+ $internal_counter += $numrows;
} else {
- if($env{'form.pdfFormFields'} eq 'yes') {
+ 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";
@@ -630,10 +773,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.="<br />";} else {$result.=' \\\\ ';}
return $result;
@@ -704,8 +852,10 @@ sub start_foil {
if ($$tagstack[-2] eq 'conceptgroup') { $level = '-3'; }
$result.=&Apache::edit::text_arg('Name:','name',$token);
my @names;
- if (defined(@{ $Apache::response::itemgroup{'names'} })) {
- @names=@{ $Apache::response::itemgroup{'names'} };
+ if (ref($Apache::response::itemgroup{'names'}) eq 'ARRAY') {
+ if (@{ $Apache::response::itemgroup{'names'} }) {
+ @names=@{ $Apache::response::itemgroup{'names'} };
+ }
}
$result.= &Apache::edit::select_or_text_arg('Correct Option:','value',['unused',@names],$token,'15');
my $randomize=&Apache::lonxml::get_param('randomize',$parstack,
@@ -754,11 +904,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;
@@ -779,5 +931,6 @@ sub insert_foil {
<endouttext />
</foil>';
}
+
1;
__END__