version 1.162, 2010/02/05 23:02:39
|
version 1.173, 2010/12/19 00:52:00
|
Line 103 sub start_foilgroup {
|
Line 103 sub start_foilgroup {
|
my $result=''; |
my $result=''; |
%Apache::response::foilgroup=(); |
%Apache::response::foilgroup=(); |
$Apache::optionresponse::conceptgroup=0; |
$Apache::optionresponse::conceptgroup=0; |
&Apache::response::pushrandomnumber(); |
&Apache::response::pushrandomnumber(undef,$target); |
if ($target eq 'edit') { |
if ($target eq 'edit') { |
my $optionlist="<option></option>\n"; |
my $optionlist="<option></option>\n"; |
my $option; |
my $option; |
Line 137 ENDTABLE
|
Line 137 ENDTABLE
|
} |
} |
$result.='>'.$option.'</option>'; |
$result.='>'.$option.'</option>'; |
} |
} |
$result.='</select></label>'; |
$result.='</select></label>'; |
|
$result.=&Apache::edit::checked_arg('Checkbox options:','checkboxoptions', |
|
[ ['nochoice','Don\'t show option list'] ] |
|
,$token).'</td>'; |
$result.= &Apache::edit::end_row(); |
$result.= &Apache::edit::end_row(); |
$result.= &Apache::edit::start_spanning_row(); |
$result.= &Apache::edit::start_spanning_row(); |
$result.= $insertlist.'<br />'; |
$result.= $insertlist.'<br />'; |
Line 162 ENDTABLE
|
Line 165 ENDTABLE
|
$optchanged=1; |
$optchanged=1; |
} |
} |
my $rebuildtag = &Apache::edit::get_new_args($token,$parstack,$safeeval, |
my $rebuildtag = &Apache::edit::get_new_args($token,$parstack,$safeeval, |
'texoptions','checkboxvalue'); |
'texoptions','checkboxvalue','checkboxoptions'); |
if ($optchanged || $rebuildtag ) { |
if ($optchanged || $rebuildtag ) { |
$result = "<foilgroup options=\"("; |
$result = "<foilgroup options=\"("; |
foreach my $option (@options) { |
foreach my $option (@options) { |
Line 173 ENDTABLE
|
Line 176 ENDTABLE
|
chop $result; |
chop $result; |
$result.=')" '; |
$result.=')" '; |
$result .= 'texoptions="'.$token->[2]{'texoptions'}.'" '; |
$result .= 'texoptions="'.$token->[2]{'texoptions'}.'" '; |
|
$result .= 'checkboxoptions="'.$token->[2]{'checkboxoptions'}.'" '; |
$result .= 'checkboxvalue="'.$token->[2]{'checkboxvalue'}.'"'; |
$result .= 'checkboxvalue="'.$token->[2]{'checkboxvalue'}.'"'; |
$result .= '>'; |
$result .= '>'; |
} # else nothing changed so just use the default mechanism |
} # else nothing changed so just use the default mechanism |
} |
} |
if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') { |
if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') { |
if($env{'form.pdfFormFields'} ne 'yes') { |
if($env{'form.pdfFormFields'} ne 'yes') { |
$result .= ' \renewcommand{\labelenumi}{\Alph{enumi}.} |
$result .= ' \begin{itemize} '; |
\begin{enumerate} '; |
|
} else { |
} else { |
$result .= "\\\\"; |
$result .= "\\\\"; |
} |
} |
Line 203 sub end_foilgroup {
|
Line 206 sub end_foilgroup {
|
my $TeXlayout=&Apache::lonxml::get_param('TeXlayout',$parstack,$safeeval, |
my $TeXlayout=&Apache::lonxml::get_param('TeXlayout',$parstack,$safeeval, |
-2,0); |
-2,0); |
my $checkboxvalue=&Apache::lonxml::get_param('checkboxvalue',$parstack,$safeeval); |
my $checkboxvalue=&Apache::lonxml::get_param('checkboxvalue',$parstack,$safeeval); |
|
my $checkboxchoices=(&Apache::lonxml::get_param('checkboxoptions',$parstack,$safeeval) ne 'nochoice'); |
if ($target eq 'tex' && $tex_option_switch eq 'nochoice') {@opt=();} |
if ($target eq 'tex' && $tex_option_switch eq 'nochoice') {@opt=();} |
&Apache::lonxml::debug("Options are $#opt"); |
&Apache::lonxml::debug("Options are $#opt"); |
my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2'); |
my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2'); |
my $randomize = &Apache::lonxml::get_param('randomize',$parstack, |
my $randomize = &Apache::lonxml::get_param('randomize',$parstack, |
$safeeval,'-2'); |
$safeeval,'-2'); |
if ($target eq 'web' || $target eq 'tex') { |
if ($target eq 'web' || $target eq 'tex') { |
$result.=&displayfoils($target,$max,$randomize,$TeXlayout,$checkboxvalue,@opt); |
$result.=&displayfoils($target,$max,$randomize,$TeXlayout,$checkboxvalue,$checkboxchoices,@opt); |
$Apache::lonxml::post_evaluate=0; |
$Apache::lonxml::post_evaluate=0; |
} elsif ( $target eq 'answer') { |
} elsif ( $target eq 'answer') { |
$result.=&displayanswers($max,$randomize,@opt); |
$result.=&displayanswers($max,$randomize,@opt); |
Line 258 sub end_foilgroup {
|
Line 262 sub end_foilgroup {
|
$Apache::lonhomework::results{"resource.$part.$id.submission"}= |
$Apache::lonhomework::results{"resource.$part.$id.submission"}= |
$responsestr; |
$responsestr; |
$Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}=$gradestr; |
$Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}=$gradestr; |
|
if ($Apache::lonhomework::type eq 'randomizetry') { |
if ($Apache::lonhomework::type eq 'survey') { |
$Apache::lonhomework::results{"resource.$part.$id.foilorder"} = &Apache::lonnet::array2str(@whichopt); |
|
} |
|
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 'anonsurveycred') { |
|
$ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='ANONYMOUS_CREDIT'; |
|
} elsif ($Apache::lonhomework::type eq 'anonsurvey') { |
|
$ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='ANONYMOUS'; |
|
} 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 315 sub end_foilgroup {
|
Line 333 sub end_foilgroup {
|
} |
} |
if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') { |
if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') { |
if($env{'form.pdfFormFields'} ne 'yes') { |
if($env{'form.pdfFormFields'} ne 'yes') { |
$result .= '\end{enumerate}'; |
$result .= '\end{itemize}'; |
} else { |
} else { |
$result .= "\\\\"; |
$result .= "\\\\"; |
} |
} |
Line 403 sub check_for_invalid {
|
Line 421 sub check_for_invalid {
|
} |
} |
|
|
sub displayfoils { |
sub displayfoils { |
my ($target,$max,$randomize,$TeXlayout,$checkboxvalue,@opt)=@_; |
my ($target,$max,$randomize,$TeXlayout,$checkboxvalue,$checkboxchoices,@opt)=@_; |
if (!defined(@{ $Apache::response::foilgroup{'names'} })) {return;} |
if (!defined(@{ $Apache::response::foilgroup{'names'} })) {return;} |
my @names = @{ $Apache::response::foilgroup{'names'} }; |
my @names = @{ $Apache::response::foilgroup{'names'} }; |
my @truelist; |
my @truelist; |
Line 423 sub displayfoils {
|
Line 441 sub displayfoils {
|
my $temp=1; |
my $temp=1; |
foreach $name (@whichopt) { |
foreach $name (@whichopt) { |
my $text=$Apache::response::foilgroup{$name.'.text'}; |
my $text=$Apache::response::foilgroup{$name.'.text'}; |
my %lastresponse=&Apache::lonnet::str2hash($Apache::lonhomework::history{"resource.$part.$id.submission"}); |
my $lastresp; |
|
unless ((($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurvey') || ($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurveycred')) && (defined($env{'form.grade_symb'}))) { |
|
$lastresp = $Apache::lonhomework::history{"resource.$part.$id.submission"}; |
|
} |
|
my %lastresponse=&Apache::lonnet::str2hash($lastresp); |
my $lastopt=$lastresponse{$name}; |
my $lastopt=$lastresponse{$name}; |
if ($text!~/^\s*$/) { $break='<br />'; } |
if ($text!~/^\s*$/) { $break='<br />'; } |
$result.=$break; |
$result.=$break; |
Line 436 sub displayfoils {
|
Line 458 sub displayfoils {
|
$text='<b>'.$value.':</b> '.$text; |
$text='<b>'.$value.':</b> '.$text; |
} |
} |
} else { |
} else { |
$text='•'.$text; |
if (@whichopt > 1) { |
|
$text='•'.$text; |
|
} |
} |
} |
$result.=$text."\n"; |
$result.=$text."\n"; |
} |
} |
Line 447 sub displayfoils {
|
Line 471 sub displayfoils {
|
} |
} |
} else { |
} else { |
my $temp=1; |
my $temp=1; |
my %lastresponse=&Apache::lonnet::str2hash($Apache::lonhomework::history{"resource.$part.$id.submission"}); |
my %lastresponse; |
|
my $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) { |
|
%lastresponse=&Apache::lonnet::str2hash($Apache::lonhomework::history{"resource.$part.$id.submission"}); |
|
} |
my $internal_counter=$Apache::lonxml::counter; |
my $internal_counter=$Apache::lonxml::counter; |
my $checkboxopt=&check_box_opt($target,$checkboxvalue,@opt); |
my $checkboxopt=&check_box_opt($target,$checkboxvalue,@opt); |
if ($checkboxopt) { |
if ($checkboxopt) { |
$result.='<br />'.&mt('Choices: ').'<b>'.$opt[0].','.$opt[1].'</b>. '. |
$result.='<br />'. |
&mt('Select all that are <b>[_1]</b>.',$checkboxopt); |
($checkboxchoices?&mt('Choices: ').'<b>'.$opt[0].','.$opt[1].'</b>. ':''). |
|
&mt('Select all that are <b>[_1]</b>.',$checkboxopt); |
} |
} |
foreach $name (@whichopt) { |
foreach $name (@whichopt) { |
my $text=$Apache::response::foilgroup{$name.'.text'}; |
my $text=$Apache::response::foilgroup{$name.'.text'}; |
Line 476 sub displayfoils {
|
Line 513 sub displayfoils {
|
my $escopt=&HTML::Entities::encode($option,'\'"&<>'); |
my $escopt=&HTML::Entities::encode($option,'\'"&<>'); |
if ($option eq $lastopt) { |
if ($option eq $lastopt) { |
if ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes' |
if ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes' |
&& $Apache::inputtags::status[-1] eq 'CAN_ANSWER') { |
&& $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 { |
$optionlist.="<option value='".$escopt."' selected=\"selected\">$option</option>\n"; |
$optionlist.="<option value='".$escopt."' selected=\"selected\">$option</option>\n"; |
} |
} |
} else { |
} else { |
if ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes' |
if ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes' |
&& $Apache::inputtags::status[-1] eq 'CAN_ANSWER') { |
&& $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 { |
$optionlist.="<option value='".$escopt."'>$option</option>\n"; |
$optionlist.="<option value='".$escopt."'>$option</option>\n"; |
Line 525 sub displayfoils {
|
Line 564 sub displayfoils {
|
} |
} |
if ($text=~s|<drawoptionlist\s*/>|$optionlist|) { |
if ($text=~s|<drawoptionlist\s*/>|$optionlist|) { |
if ($Apache::lonhomework::type ne 'exam') { |
if ($Apache::lonhomework::type ne 'exam') { |
$text='•'.$text; |
if (@whichopt > 1) { |
|
$text='•'.$text; |
|
} |
} |
} |
} else { |
} else { |
if ($Apache::lonhomework::type ne 'exam') { |
if ($Apache::lonhomework::type ne 'exam') { |
Line 565 sub displayfoils {
|
Line 606 sub displayfoils {
|
} |
} |
} |
} |
if ($Apache::lonhomework::type eq 'exam') { |
if ($Apache::lonhomework::type eq 'exam') { |
$result.='\vskip -1 mm\noindent\begin{enumerate}\item[\textbf{'. |
$result.='\vskip -1 mm\noindent'; |
$internal_counter.'}.]'.&bubbles(\@alphabet,\@opt). |
$result.= '\textbf{'. $internal_counter.'}. \vskip -3mm'.&bubbles(\@alphabet,\@opt). |
'\end{enumerate} \vskip -8 mm \strut '; |
' \strut '; |
$internal_counter++; |
$internal_counter++; |
} |
} |
if ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes' |
if ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes' |
&& $Apache::inputtags::status[-1] eq 'CAN_ANSWER') { |
&& $Apache::inputtags::status[-1] eq 'CAN_ANSWER' |
|
&& $Apache::lonhomework::type ne 'exam') { |
$text =~ s/\\item//m; |
$text =~ s/\\item//m; |
$result .= " $optionlist ". &Apache::lonxml::print_pdf_end_combobox($text).'\strut \\\\'; |
$result .= " $optionlist ". &Apache::lonxml::print_pdf_end_combobox($text).'\strut \\\\'; |
$temp++; |
$temp++; |
Line 582 sub displayfoils {
|
Line 624 sub displayfoils {
|
} |
} |
|
|
if ($target eq 'web') { |
if ($target eq 'web') { |
&Apache::response::setup_prior_tries_hash(\&Apache::rankresponse::format_prior_answer, |
my $data = [\@whichopt,'submissiongrading']; |
[\@whichopt, |
my $questiontype; |
'submissiongrading']); |
if ($Apache::lonhomework::type eq 'randomizetry') { |
|
$questiontype = $Apache::lonhomework::type, |
|
} |
|
&Apache::response::setup_prior_tries_hash(\&Apache::rankresponse::format_prior_answer,$data,$questiontype); |
} |
} |
|
|
if ($target ne 'tex') { |
if ($target ne 'tex') { |
Line 673 sub bubbles {
|
Line 718 sub bubbles {
|
|
|
$current_length += (length($opt[$ind])+length($alphabet[$ind])+4)*2; |
$current_length += (length($opt[$ind])+length($alphabet[$ind])+4)*2; |
if ($current_length<($textwidth-$leftmargin) and $ind!=$number_of_bubbles) { |
if ($current_length<($textwidth-$leftmargin) and $ind!=$number_of_bubbles) { |
$line.='\hskip -1 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -1 mm & \hskip -3 mm {\small '.$opt[$ind].'} & '; |
$line.='\hskip 4 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -1 mm & \hskip -3 mm {\small '.$opt[$ind].'} & '; |
$head.='lr'; |
$head.='lr'; |
} else { |
} else { |
$line=~s/\&\s*$//; |
$line=~s/\&\s*$//; |
$result.='\vskip -2 mm\noindent\setlength{\tabcolsep}{2 mm}\begin{tabular}{'.$head.'}'.$line.'\\\\\end{tabular}\vskip 0 mm'; |
$result.='\vskip -1 mm\noindent\setlength{\tabcolsep}{2 mm}\renewcommand{\arraystretch}{1.25}\begin{tabular}{'.$head.'}'.$line.'\\\\\end{tabular}\vskip 0 mm'; |
$line = '\hskip -1 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -1 mm & \hskip -3 mm {\small '.$opt[$ind].'} & ';; |
$line = '\hskip 4 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -1 mm & \hskip -3 mm {\small '.$opt[$ind].'} & ';; |
$head ='lr'; |
$head ='lr'; |
$current_length = (length($opt[$ind])+length($alphabet[$ind]))*2; |
$current_length = (length($opt[$ind])+length($alphabet[$ind]))*2; |
} |
} |