| '.&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);
@@ -169,14 +173,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;
}
@@ -194,7 +220,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);
}
@@ -247,12 +274,14 @@ 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)
- ." |
| '.&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 +290,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,8 +310,20 @@ sub end_foilgroup {
['text','value','location']);
#FIXME need to store options in some way
}
- &Apache::lonxml::increment_counter(&getfoilcounts($max),
- $Apache::inputtags::part);
+ 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();
}
@@ -344,6 +388,7 @@ 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'} })) {
@@ -351,11 +396,47 @@ sub grade_response {
%{ $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
\n");
@@ -367,9 +448,9 @@ sub grade_response {
} else {
$ignored++;
}
- $temp++;
}
my $part=$Apache::inputtags::part;
+ my $nonlenient=&Apache::optionresponse::is_nonlenient($part);
my $id = $Apache::inputtags::response['-1'];
my $responsestr=&Apache::lonnet::hash2str(%responsehash);
my $itemstr =&Apache::lonnet::array2str(@items);
@@ -382,43 +463,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);
}
}
@@ -490,11 +589,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};
@@ -503,15 +620,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') {
@@ -559,17 +695,34 @@ sub displayfoils {
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 {
- $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++;
@@ -603,10 +756,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.="
";} else {$result.=' \\\\ ';}
return $result;
@@ -715,23 +873,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;
@@ -752,5 +912,6 @@ sub insert_foil {
';
}
+
1;
__END__
|