version 1.156, 2008/11/20 15:19:15
|
version 1.171, 2010/09/01 21:29:51
|
Line 65 sub start_optionresponse {
|
Line 65 sub start_optionresponse {
|
&Apache::edit::select_arg('Randomize Foil Order:','randomize', |
&Apache::edit::select_arg('Randomize Foil Order:','randomize', |
['yes','no'],$token). |
['yes','no'],$token). |
&Apache::edit::select_arg(&mt('Display of options when printed'),'TeXlayout', |
&Apache::edit::select_arg(&mt('Display of options when printed'),'TeXlayout', |
[['horizontal',&mt('Normal list')], |
[['horizontal','Normal list'], |
['vertical',&mt('Listed in a vertical column')]],$token). |
['vertical','Listed in a vertical column']],$token). |
&Apache::edit::end_row().&Apache::edit::start_spanning_row(); |
&Apache::edit::end_row().&Apache::edit::start_spanning_row(); |
} elsif ($target eq 'modified') { |
} elsif ($target eq 'modified') { |
my $constructtag=&Apache::edit::get_new_args($token,$parstack, |
my $constructtag=&Apache::edit::get_new_args($token,$parstack, |
Line 123 sub start_foilgroup {
|
Line 123 sub start_foilgroup {
|
</td> |
</td> |
<td>Delete an Option: |
<td>Delete an Option: |
<select name="$Apache::lonxml::curdepth.deleteopt">$optionlist</select> |
<select name="$Apache::lonxml::curdepth.deleteopt">$optionlist</select> |
|
</td> |
ENDTABLE |
ENDTABLE |
$result.= &Apache::edit::checked_arg('Print options:','texoptions', |
$result.= '<td>'.&Apache::edit::checked_arg('Print options:','texoptions', |
[ ['nochoice','Don\'t show option list'] ] |
[ ['nochoice','Don\'t show option list'] ] |
,$token); |
,$token).'</td>'; |
|
$result.= '<td><label>'.&mt('Two-option checkboxes for:'). |
|
'<select name="checkboxvalue_'.$Apache::lonxml::curdepth.'">'; |
|
foreach $option (('',@opt)) { |
|
$result.='<option value="'.$option.'"'; |
|
if ($option eq &Apache::lonxml::get_param('checkboxvalue',$parstack,$safeeval)) { |
|
$result.=' selected="selected"'; |
|
} |
|
$result.='>'.$option.'</option>'; |
|
} |
|
$result.='</select></label>'; |
$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 151 ENDTABLE
|
Line 162 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')); |
'texoptions','checkboxvalue'); |
if ($optchanged || $rebuildtag ) { |
if ($optchanged || $rebuildtag ) { |
$result = "<foilgroup options=\"("; |
$result = "<foilgroup options=\"("; |
foreach my $option (@options) { |
foreach my $option (@options) { |
Line 162 ENDTABLE
|
Line 173 ENDTABLE
|
chop $result; |
chop $result; |
$result.=')" '; |
$result.=')" '; |
$result .= 'texoptions="'.$token->[2]{'texoptions'}.'" '; |
$result .= 'texoptions="'.$token->[2]{'texoptions'}.'" '; |
|
$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 190 sub end_foilgroup {
|
Line 201 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); |
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,@opt); |
$result.=&displayfoils($target,$max,$randomize,$TeXlayout,$checkboxvalue,@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 246 sub end_foilgroup {
|
Line 258 sub end_foilgroup {
|
$responsestr; |
$responsestr; |
$Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}=$gradestr; |
$Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}=$gradestr; |
|
|
if ($Apache::lonhomework::type eq 'survey') { |
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 302 sub end_foilgroup {
|
Line 326 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 359 sub displayanswers {
|
Line 383 sub displayanswers {
|
return $result; |
return $result; |
} |
} |
|
|
|
sub check_box_opt { |
|
my ($target,$checkboxvalue,@opt)=@_; |
|
# Check if we are in checkbox mode: checkboxvalue specified, on web, only two options. |
|
# If so, return "checked" value |
|
if ($#opt!=1) { return ''; } |
|
if ($target ne 'web') { return ''; } |
|
return $checkboxvalue; |
|
} |
|
|
sub check_for_invalid { |
sub check_for_invalid { |
my ($names,$options) = @_; |
my ($names,$options) = @_; |
my %bad_names; |
my %bad_names; |
Line 381 sub check_for_invalid {
|
Line 414 sub check_for_invalid {
|
} |
} |
|
|
sub displayfoils { |
sub displayfoils { |
my ($target,$max,$randomize,$TeXlayout,@opt)=@_; |
my ($target,$max,$randomize,$TeXlayout,$checkboxvalue,@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 401 sub displayfoils {
|
Line 434 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 414 sub displayfoils {
|
Line 451 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 427 sub displayfoils {
|
Line 466 sub displayfoils {
|
my $temp=1; |
my $temp=1; |
my %lastresponse=&Apache::lonnet::str2hash($Apache::lonhomework::history{"resource.$part.$id.submission"}); |
my %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); |
|
if ($checkboxopt) { |
|
$result.='<br />'.&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'}; |
if ($text!~/^\s*$/) { |
if ($text!~/^\s*$/) { |
Line 439 sub displayfoils {
|
Line 483 sub displayfoils {
|
my $lastopt=$lastresponse{$name}; |
my $lastopt=$lastresponse{$name}; |
my $optionlist="<option></option>\n"; |
my $optionlist="<option></option>\n"; |
|
|
if($target eq 'tex' and $env{'form.pdfFormFields'} eq 'yes') { |
if($target eq 'tex' and $env{'form.pdfFormFields'} eq 'yes' |
|
&& $Apache::inputtags::status[-1] eq 'CAN_ANSWER') { |
my $fieldname = $env{'request.symb'}.'&part_'.$Apache::inputtags::part.'&optionresponse'.'&HWVAL_'.$Apache::inputtags::response['-1'].':'.$temp; |
my $fieldname = $env{'request.symb'}.'&part_'.$Apache::inputtags::part.'&optionresponse'.'&HWVAL_'.$Apache::inputtags::response['-1'].':'.$temp; |
$optionlist = &Apache::lonxml::print_pdf_start_combobox($fieldname); |
$optionlist = &Apache::lonxml::print_pdf_start_combobox($fieldname); |
} |
} |
Line 447 sub displayfoils {
|
Line 492 sub displayfoils {
|
foreach my $option (@opt) { |
foreach my $option (@opt) { |
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::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::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 462 sub displayfoils {
|
Line 511 sub displayfoils {
|
} |
} |
if ($target ne 'tex') { |
if ($target ne 'tex') { |
if ($Apache::lonhomework::type ne 'exam') { |
if ($Apache::lonhomework::type ne 'exam') { |
$optionlist='<select onchange="javascript:setSubmittedPart(\''. |
# we are on the web, this is not an exam, and the problem can be answered |
|
if ($checkboxopt) { |
|
# generate checkboxes |
|
my $fieldname=$Apache::inputtags::response['-1'].':'.$temp; |
|
my $altopt=$opt[0]; |
|
if ($opt[0] eq $checkboxopt) { |
|
$altopt=$opt[1]; |
|
} |
|
my $defopt=$lastopt; |
|
unless ($defopt) { $defopt=$altopt; } |
|
my $escdefopt=&HTML::Entities::encode($defopt,'\'"&<>'); |
|
my $esccheckboxopt=&HTML::Entities::encode($checkboxopt,'\'"&<>'); |
|
my $escaltopt=&HTML::Entities::encode($altopt,'\'"&<>'); |
|
# checkboxopt is how the box is labelled |
|
# altopt is the alternative option |
|
# lastopt is what the user submitted before |
|
# defopt is what the field is going to start out with: either previous choice or altopt |
|
# fieldname is this input field's name after HWVAL_ |
|
$optionlist='<input type="hidden" name="HWVAL_'.$fieldname.'" value="'.$escdefopt.'" />'. |
|
'<input type="checkbox" name="HWCHK_'.$fieldname.'" onclick="javascript:if (this.form.elements[\'HWCHK_'. |
|
$fieldname.'\'].checked) { this.form.elements[\'HWVAL_'.$fieldname.'\'].value=\''.$esccheckboxopt.'\'; } else { this.form.elements[\'HWVAL_'.$fieldname.'\'].value=\''.$escaltopt.'\'; };setSubmittedPart(\''.$part.'\');"'.($defopt eq $checkboxopt?' checked="checked"':'')." />\n"; |
|
} else { |
|
# classic selection list |
|
$optionlist='<select onchange="javascript:setSubmittedPart(\''. |
$part.'\');" name="HWVAL_'. |
$part.'\');" name="HWVAL_'. |
$Apache::inputtags::response['-1'].':'.$temp.'">'. |
$Apache::inputtags::response['-1'].':'.$temp.'">'. |
$optionlist."</select>\n"; |
$optionlist."</select>\n"; |
|
} |
} else { |
} else { |
$optionlist='<u>'.(' 'x10).'</u>'; |
$optionlist='<u>'.(' 'x10).'</u>'; |
} |
} |
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 511 sub displayfoils {
|
Line 586 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' |
$text =~ s/.*indent(.*)$/$1/; |
&& $Apache::inputtags::status[-1] eq 'CAN_ANSWER' |
$text = $1; |
&& $Apache::lonhomework::type ne 'exam') { |
|
$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 619 sub bubbles {
|
Line 695 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; |
} |
} |
Line 841 start_optionresponse()
|
Line 917 start_optionresponse()
|
|
|
=back |
=back |
|
|
=cut |
|
|
|
|
=cut |