version 1.73, 2008/12/11 00:56:20
|
version 1.81, 2010/12/19 00:54:20
|
Line 180 sub end_itemgroup {
|
Line 180 sub end_itemgroup {
|
$i++; |
$i++; |
} |
} |
$table.=' \end{description} \strut '; |
$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::matchresponse::itemtable{'display'}=$table; |
$Apache::lonxml::post_evaluate=0; |
$Apache::lonxml::post_evaluate=0; |
} |
} |
Line 252 sub start_foilgroup {
|
Line 252 sub start_foilgroup {
|
my $result; |
my $result; |
%Apache::response::foilgroup=(); |
%Apache::response::foilgroup=(); |
$Apache::matchresponse::conceptgroup=0; |
$Apache::matchresponse::conceptgroup=0; |
&Apache::response::pushrandomnumber(); |
&Apache::response::pushrandomnumber(undef,$target); |
if ($target eq 'edit') { |
if ($target eq 'edit') { |
$result.=&Apache::edit::start_table($token) |
$result.=&Apache::edit::start_table($token) |
.'<tr><td>'.&mt('Collection Of Foils').'</td>' |
.'<tr><td>'.&mt('Collection Of Foils').'</td>' |
Line 354 sub grade_response {
|
Line 354 sub grade_response {
|
if (!&Apache::response::submitted()) { return; } |
if (!&Apache::response::submitted()) { return; } |
my %responsehash; |
my %responsehash; |
my %grade; |
my %grade; |
|
my %answerhash; |
my ($temp,$right,$wrong,$ignored)=(1,0,0,0); |
my ($temp,$right,$wrong,$ignored)=(1,0,0,0); |
my %letter_name_map; |
my %letter_name_map; |
if (defined(%{ $Apache::response::itemgroup{'letter_name_map'} })) { |
if (defined(%{ $Apache::response::itemgroup{'letter_name_map'} })) { |
Line 366 sub grade_response {
|
Line 367 sub grade_response {
|
push(@items,$response); |
push(@items,$response); |
my $responsename = $letter_name_map{$response}; |
my $responsename = $letter_name_map{$response}; |
my $value=$Apache::response::foilgroup{$name.'.value'}; |
my $value=$Apache::response::foilgroup{$name.'.value'}; |
|
if ($Apache::lonhomework::type eq 'randomizetry') { |
|
$answerhash{$name} = $value; |
|
} |
if ( $response =~ /[^\s]/) { |
if ( $response =~ /[^\s]/) { |
$responsehash{$name}=$responsename; |
$responsehash{$name}=$responsename; |
&Apache::lonxml::debug("submitted a $response($responsename) for $value<br />\n"); |
&Apache::lonxml::debug("submitted a $response($responsename) for $value<br />\n"); |
Line 392 sub grade_response {
|
Line 396 sub grade_response {
|
$itemstr; |
$itemstr; |
$Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}= |
$Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}= |
$gradestr; |
$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) { |
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); |
&Apache::response::handle_previous(\%previous,$ad); |
} elsif ($wrong==0 && $right==0) { |
} elsif ($wrong==0 && $right==0) { |
} else { |
} else { |
Line 500 sub displayfoils {
|
Line 519 sub displayfoils {
|
my $temp=1; |
my $temp=1; |
my $id=$Apache::inputtags::response[-1]; |
my $id=$Apache::inputtags::response[-1]; |
my $part=$Apache::inputtags::part; |
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 %lastresponse=&Apache::lonnet::str2hash($lastresponse); |
my @alphabet=('A'..'Z'); |
my @alphabet=('A'..'Z'); |
my @used_letters=sort(keys(%letter_name_map)); |
my @used_letters=sort(keys(%letter_name_map)); |
Line 513 sub displayfoils {
|
Line 543 sub displayfoils {
|
$optionlist="<option></option>\n"; |
$optionlist="<option></option>\n"; |
} else { |
} else { |
if ($Apache::lonhomework::type ne 'exam') { |
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 . '&'; |
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); |
$optionlist = &Apache::lonxml::print_pdf_start_combobox($fieldname); |
} else { |
} else { |
|
|
$optionlist='\framebox[10 mm][s]{\tiny\strut}'; |
$optionlist='\framebox[10 mm][s]{\tiny\strut}'; |
} |
} |
} |
} |
} |
} |
my $option; |
my $option; |
foreach $option (@used_letters) { |
foreach $option (@used_letters) { |
if ($option eq $last_letter) { |
if ($option eq $last_letter) { |
if ($target ne 'tex') { |
if ($target ne 'tex') { |
$optionlist.="<option selected=\"on\">$option</option>\n"; |
$optionlist.="<option selected=\"selected\">$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); |
$optionlist .= &Apache::lonxml::print_pdf_add_combobox_option($option); |
} |
} |
} else { |
} else { |
if ($target ne 'tex') { |
if ($target ne 'tex') { |
$optionlist.="<option>$option</option>\n"; |
$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); |
$optionlist .= &Apache::lonxml::print_pdf_add_combobox_option($option); |
} |
} |
} |
} |
Line 577 sub displayfoils {
|
Line 613 sub displayfoils {
|
# Note that if left or right positioned, we must |
# Note that if left or right positioned, we must |
# confine the bubbles to righttabsize: |
# 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"; |
$question.=' '.$optionlist.$text."\n"; |
my @emptyItems = (); |
my @emptyItems = (); |
for (my $i=0;$i<=$#used_letters;$i++) {push @emptyItems, ' ';} |
for (my $i=0;$i<=$#used_letters;$i++) {push @emptyItems, ' ';} |
$question.='\vskip -1 mm\noindent\begin{list}{}{\setlength{\listparindent}{0mm}\setlength{\leftmargin}{2mm}}' |
$question.='\vskip -1 mm\noindent\begin{list}{}{\setlength{\listparindent}{0mm}\setlength{\leftmargin}{2mm}}' |
.'\item \hskip -3mm \textbf{'.$internal_counter.'}'; |
.'\item \hskip -3mm \textbf{'.$internal_counter.'}'; |
if (&itemdisplay('left') || &itemdisplay('right')) { |
if (&itemdisplay('left') || &itemdisplay('right')) { |
$question .= &Apache::optionresponse::bubbles(\@used_letters,\@emptyItems, "", $righttabsize); |
$question .= '\vskip -4 mm' . &Apache::optionresponse::bubbles(\@used_letters,\@emptyItems, "", $righttabsize); |
} |
} |
else { |
else { |
$question .= &Apache::optionresponse::bubbles(\@used_letters,\@emptyItems); |
$question .= '\vskip -4 mm' . &Apache::optionresponse::bubbles(\@used_letters,\@emptyItems); |
} |
} |
$question .= '\end{list} \vskip -8 mm \strut '; |
$question .= '\end{list} \vskip -8 mm \strut '; |
$internal_counter++; |
$internal_counter++; |
} else { |
} 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'; |
$question .= " $optionlist ". &Apache::lonxml::print_pdf_end_combobox($text).'\strut'; |
} else { |
} else { |
$question.=' '.$optionlist.$text.'\strut\\\\\strut '."\n"; |
$question.=' '.$optionlist.$text.'\strut\\\\\strut '."\n"; |
Line 630 sub displayfoils {
|
Line 667 sub displayfoils {
|
} |
} |
} |
} |
if ($target eq 'web') { |
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, |
&Apache::response::setup_prior_tries_hash(\&format_prior_answer, |
[\@whichfoils, |
[\@whichfoils, |
'submissiongrading', |
'submissiongrading', |
'submissionitems']); |
'submissionitems'], |
|
$questiontype); |
} |
} |
if ($target ne 'tex') {$result.="<br />";} else {$result.=' \\\\ ';} |
if ($target ne 'tex') {$result.="<br />";} else {$result.=' \\\\ ';} |
return $result; |
return $result; |
Line 754 sub end_foil {
|
Line 796 sub end_foil {
|
$safeeval); |
$safeeval); |
if ( $Apache::matchresponse::conceptgroup |
if ( $Apache::matchresponse::conceptgroup |
&& !&Apache::response::showallfoils() ) { |
&& !&Apache::response::showallfoils() ) { |
|
|
push @{ $Apache::response::conceptgroup{'names'} }, $name; |
push @{ $Apache::response::conceptgroup{'names'} }, $name; |
$Apache::response::conceptgroup{"$name.value"} = $value; |
$Apache::response::conceptgroup{"$name.value"} = $value; |
$Apache::response::conceptgroup{"$name.text"} = $text; |
$Apache::response::conceptgroup{"$name.text"} = $text; |
$Apache::response::conceptgroup{"$name.location"} = $location; |
$Apache::response::conceptgroup{"$name.location"} = $location; |
} else { |
} else { |
|
|
push @{ $Apache::response::foilgroup{'names'} }, $name; |
push @{ $Apache::response::foilgroup{'names'} }, $name; |
$Apache::response::foilgroup{"$name.value"} = $value; |
$Apache::response::foilgroup{"$name.value"} = $value; |
$Apache::response::foilgroup{"$name.text"} = $text; |
$Apache::response::foilgroup{"$name.text"} = $text; |