version 1.161, 2010/02/05 21:38:41
|
version 1.169, 2010/08/23 11:33:29
|
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 247 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 303 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 411 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 440 sub displayfoils {
|
Line 467 sub displayfoils {
|
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('Choices: ').'<b>'.$opt[0].','.$opt[1].'</b>. '. |
&mt('Select all that are <b>[_1]</b>.',$checkboxopt); |
&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 464 sub displayfoils {
|
Line 491 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 553 sub displayfoils {
|
Line 582 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 661 sub bubbles {
|
Line 691 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 1pc {\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*$//; |