--- loncom/homework/optionresponse.pm 2010/02/05 23:02:39 1.162
+++ loncom/homework/optionresponse.pm 2010/08/23 11:54:31 1.170
@@ -1,7 +1,7 @@
# LearningOnline Network with CAPA
# option list style responses
#
-# $Id: optionresponse.pm,v 1.162 2010/02/05 23:02:39 www Exp $
+# $Id: optionresponse.pm,v 1.170 2010/08/23 11:54:31 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -179,8 +179,7 @@ ENDTABLE
}
if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') {
if($env{'form.pdfFormFields'} ne 'yes') {
- $result .= ' \renewcommand{\labelenumi}{\Alph{enumi}.}
- \begin{enumerate} ';
+ $result .= ' \begin{itemize} ';
} else {
$result .= "\\\\";
}
@@ -259,9 +258,21 @@ sub end_foilgroup {
$responsestr;
$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) {
- 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);
} elsif ($wrong==0 && $right==0) {
} else {
@@ -315,7 +326,7 @@ sub end_foilgroup {
}
if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') {
if($env{'form.pdfFormFields'} ne 'yes') {
- $result .= '\end{enumerate}';
+ $result .= '\end{itemize}';
} else {
$result .= "\\\\";
}
@@ -423,7 +434,11 @@ sub displayfoils {
my $temp=1;
foreach $name (@whichopt) {
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};
if ($text!~/^\s*$/) { $break='
'; }
$result.=$break;
@@ -436,7 +451,9 @@ sub displayfoils {
$text=''.$value.': '.$text;
}
} else {
- $text=''.$text;
+ if (@whichopt > 1) {
+ $text=''.$text;
+ }
}
$result.=$text."\n";
}
@@ -452,7 +469,7 @@ sub displayfoils {
my $checkboxopt=&check_box_opt($target,$checkboxvalue,@opt);
if ($checkboxopt) {
$result.='
'.&mt('Choices: ').''.$opt[0].','.$opt[1].'. '.
- &mt('Select all that are [_1].',$checkboxopt);
+ &mt('Select all that are [_1].',$checkboxopt);
}
foreach $name (@whichopt) {
my $text=$Apache::response::foilgroup{$name.'.text'};
@@ -476,14 +493,16 @@ sub displayfoils {
my $escopt=&HTML::Entities::encode($option,'\'"&<>');
if ($option eq $lastopt) {
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);
} else {
$optionlist.="\n";
}
} else {
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);
} else {
$optionlist.="\n";
@@ -525,7 +544,9 @@ sub displayfoils {
}
if ($text=~s||$optionlist|) {
if ($Apache::lonhomework::type ne 'exam') {
- $text=''.$text;
+ if (@whichopt > 1) {
+ $text=''.$text;
+ }
}
} else {
if ($Apache::lonhomework::type ne 'exam') {
@@ -565,13 +586,14 @@ sub displayfoils {
}
}
if ($Apache::lonhomework::type eq 'exam') {
- $result.='\vskip -1 mm\noindent\begin{enumerate}\item[\textbf{'.
- $internal_counter.'}.]'.&bubbles(\@alphabet,\@opt).
- '\end{enumerate} \vskip -8 mm \strut ';
+ $result.='\vskip -1 mm\noindent';
+ $result.= '\textbf{'. $internal_counter.'}. \vskip -3mm'.&bubbles(\@alphabet,\@opt).
+ ' \strut ';
$internal_counter++;
}
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;
$result .= " $optionlist ". &Apache::lonxml::print_pdf_end_combobox($text).'\strut \\\\';
$temp++;
@@ -673,7 +695,7 @@ sub bubbles {
$current_length += (length($opt[$ind])+length($alphabet[$ind])+4)*2;
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';
} else {
$line=~s/\&\s*$//;