--- loncom/homework/matchresponse.pm 2011/09/13 21:42:58 1.82
+++ loncom/homework/matchresponse.pm 2025/01/27 15:04:15 1.95
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Full matching style response
#
-# $Id: matchresponse.pm,v 1.82 2011/09/13 21:42:58 raeburn Exp $
+# $Id: matchresponse.pm,v 1.95 2025/01/27 15:04:15 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -34,6 +34,7 @@ use Apache::optionresponse();
use Apache::lonlocal;
use Apache::lonnet;
use Apache::lonxml;
+use POSIX qw(ceil);
BEGIN {
&Apache::lonxml::register('Apache::matchresponse',('matchresponse'));
@@ -54,7 +55,7 @@ sub start_matchresponse {
$result=&Apache::response::meta_package_write('matchresponse');
} elsif ($target eq 'edit' ) {
$result.=&Apache::edit::start_table($token).
- '<tr><td>'.&Apache::lonxml::description($token).'</td>'
+ '<tr><td>'.&Apache::loncommon::insert_folding_button().&Apache::lonxml::description($token).'</td>'
.'<td><span class="LC_nobreak">'.&mt('Delete?').' '
.&Apache::edit::deletelist($target,$token)
.'</span></td>'
@@ -103,20 +104,25 @@ 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).' 'x 3;
+ ['yes','no'],$token);
$result.=&Apache::edit::select_arg('Items Display Location:',
'location',
['top','bottom','left','right'],
- $token).' 'x 3;
+ $token);
$result.=&Apache::edit::select_arg('Items Display Direction:',
'direction',
['vertical','horizontal'],
$token);
+ $result.=&Apache::edit::select_arg('Items Columns:',
+ 'columns',
+ [['','default'],'1','2','3','4'],
+ $token);
$result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
} elsif ($target eq 'modified') {
my $constructtag=&Apache::edit::get_new_args($token,$parstack,
$safeeval,'randomize',
- 'location','direction');
+ 'location','direction',
+ 'columns');
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
} elsif ($target eq 'web' or $target eq 'tex') {
$Apache::matchresponse::itemtable{'location'}=
@@ -131,7 +137,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' ) {
@@ -154,19 +164,50 @@ sub end_itemgroup {
$Apache::response::itemgroup{'letter_name_map'}=\%letter_name_map;
$Apache::response::itemgroup{'name_letter_map'}=\%name_letter_map;
my $direction=&Apache::lonxml::get_param('direction',$parstack,$safeeval);
+ my $columns=&Apache::lonxml::get_param('columns',$parstack,$safeeval);
+
+ unless ($columns =~ /^\d+$/) {
+ undef($columns);
+ }
if ($target eq 'web') {
-
- my $table='<br /><table>'; # extra space to match what latex does.
- my $i=0;
- if ($direction eq 'horizontal') { $table .='<tr>';}
- foreach my $name (@names) {
- if ($direction ne 'horizontal') { $table.='<tr>'; }
- $table.='<td>'.$alphabet[$i].'</td><td>'.
- $Apache::response::itemgroup{$name.'.text'}.'</td>';
- if ($direction ne 'horizontal') { $table.='</tr>'; }
- $i++;
- }
- if ($direction eq 'horizontal') { $table .='</tr>';}
+ my $table='<table class="LC_itemgroup">'; # extra space to match what latex does.
+ if ((!$columns) || ($columns < 0)) {
+ if ($direction eq 'horizontal') {
+ if (@names > 0) {
+ $columns = scalar(@names);
+ } else {
+ $columns = 1;
+ }
+ } else {
+ $columns = 1;
+ }
+ }
+ my $rows=ceil(scalar(@names)/$columns);
+ my $endloop = $columns*$rows;
+ for (my $i=0; $i<$endloop; $i++) {
+ my $label = ' ';
+ my $item = ' ';
+ my $index;
+ if ($direction eq 'horizontal') {
+ $index = $i;
+ } else {
+ $index = ($i % $columns)*$rows+int($i/$columns);
+ }
+ if ($index < scalar(@names)) {
+ $label = $alphabet[$index];
+ $item = $Apache::response::itemgroup{$names[$index].'.text'};
+ }
+ if ($i % $columns == 0) {
+ $table.='<tr>';
+ }
+ $table.= '<td>'.$label.'</td><td>'.$item.'</td>';
+ if ($columns > 1) {
+ $table .= '<td> </td>';
+ }
+ if ( ! (($i+1) % $columns) ) {
+ $table.='</tr>';
+ }
+ }
$table.='</table>';
$Apache::matchresponse::itemtable{'display'}=$table;
$Apache::lonxml::post_evaluate=0;
@@ -220,7 +261,7 @@ sub start_item {
$result=&Apache::edit::tag_start($target,$token,"Item");
$result.=&Apache::edit::text_arg('Name:','name',$token);
if ($randomize ne 'no') {
- $result.=' 'x 3 .
+ $result.=
&Apache::edit::select_arg('Location:','location',
['random','top','bottom'],
$token);
@@ -277,7 +318,8 @@ sub start_foilgroup {
&Apache::response::pushrandomnumber(undef,$target);
if ($target eq 'edit') {
$result.=&Apache::edit::start_table($token)
- .'<tr><td>'.&mt('Collection Of Foils').'</td>'
+ .'<tr><td>'.&Apache::loncommon::insert_folding_button()
+ .&mt('Collection Of Foils').'</td>'
.'<td><span class="LC_nobreak">'.&mt('Delete?')
.&Apache::edit::deletelist($target,$token)
.'</span></td>'
@@ -345,16 +387,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') {
@@ -391,9 +439,11 @@ sub grade_response {
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'} });
@@ -450,6 +500,7 @@ sub grade_response {
}
}
my $part=$Apache::inputtags::part;
+ my $nonlenient=&Apache::optionresponse::grading_is_nonlenient($part);
my $id = $Apache::inputtags::response['-1'];
my $responsestr=&Apache::lonnet::hash2str(%responsehash);
my $itemstr =&Apache::lonnet::array2str(@items);
@@ -486,34 +537,37 @@ sub grade_response {
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);
}
}
@@ -526,7 +580,10 @@ sub format_prior_answer {
my $output;
foreach my $name (@{ $foil_order }) {
- my $item=shift(@items);
+ my $item = &HTML::Entities::encode(shift(@items),'<>&"');
+ if ($item eq '') {
+ $item = ' ';
+ }
$output .= '<tr><td>'.$item.'</td></tr>';
}
return if (!defined($output));
@@ -560,14 +617,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) {
@@ -594,9 +655,19 @@ 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 @alphabet=('A'..'Z');
my @used_letters=sort(keys(%letter_name_map));
@@ -613,7 +684,7 @@ sub displayfoils {
my $last_letter=$name_letter_map{$lastopt};
my $optionlist = '';
if ($target ne 'tex') {
- $optionlist="<option></option>\n";
+ $optionlist="<option value=\"\"></option>\n";
} else {
if ($Apache::lonhomework::type ne 'exam') {
if($env{'form.pdfFormFields'} eq 'yes'
@@ -630,7 +701,7 @@ sub displayfoils {
foreach $option (@used_letters) {
if ($option eq $last_letter) {
if ($target ne 'tex') {
- $optionlist.="<option selected=\"selected\">$option</option>\n";
+ $optionlist.="<option value=\"$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') {
@@ -638,7 +709,7 @@ sub displayfoils {
}
} else {
if ($target ne 'tex') {
- $optionlist.="<option>$option</option>\n";
+ $optionlist.="<option value=\"$option\">$option</option>\n";
} elsif ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes'
&& $Apache::inputtags::status['-1'] eq 'CAN_ANSWER'
&& $Apache::lonhomework::type ne 'exam') {
@@ -647,7 +718,7 @@ sub displayfoils {
}
}
if ($target ne 'tex' && $Apache::lonhomework::type ne 'exam') {
- $optionlist='<select onchange="javascript:setSubmittedPart(\''.
+ $optionlist='<label><select onchange="javascript:setSubmittedPart(\''.
$part.'\');" name="HWVAL_'.
$Apache::inputtags::response[-1].':'.$temp.'">'.
$optionlist."</select>\n";
@@ -674,7 +745,7 @@ sub displayfoils {
}
if ($target ne 'tex') {
if ($Apache::lonhomework::type ne 'exam') {
- $question.="<br />\n".$optionlist.$text;
+ $question.="<br />\n".$optionlist.$text/'</label>';
} else {
$question.="<br />\n".$text;
}
@@ -682,7 +753,7 @@ sub displayfoils {
my @blank;
$question.=&Apache::optionresponse::webbubbles(\@used_letters,\@blank,$temp,$last_letter);
}
- } else {
+ } else {
# Note that if left or right positioned, we must
# confine the bubbles to righttabsize:
#
@@ -831,8 +902,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,