';
+ return $output;
+}
+
sub displayfoils {
my ($target,$max,$randomize,$tol)=@_;
my $result;
+ my @alphabet=('A'..'Z');
my (@whichfoils)=&whichfoils($max,$randomize);
my $part=$Apache::inputtags::part;
my $solved=$Apache::lonhomework::history{"resource.$part.solved"};
- my $status=$Apache::inputtags::status[-1];
my @whichopt=(1..($#whichfoils+1));
my @correctorder=&get_correct_order($tol,@whichfoils);
- if (($solved =~ /^correct/) || ($status eq 'SHOW_ANSWER')) {
+ if ( &Apache::response::show_answer() && ($target ne 'tex')) {
foreach my $name (@whichfoils) {
my $text=$Apache::response::foilgroup{$name.'.text'};
my $value=shift(@correctorder);
- $result.=' '.$value.':'.$text;
+ if ($target eq 'web') {
+ $result.='
'.$value.': '.$text.'
';
+ } else {
+ $result.=' \strut\\\\\strut '.$value.':'.$text;
+ }
}
} else {
my $i = 0;
- my $temp=0;
+ my $temp=1;
my $id=$Apache::inputtags::response[-1];
my $part=$Apache::inputtags::part;
- my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"};
- my %lastresponse=&Apache::lonnet::str2hash($lastresponse);
- foreach my $name (@whichfoils) {
+ 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 ($newvariation) {
+ if ((($env{'form.grade_username'} eq '') && ($env{'form.grade_domain'} eq '')) ||
+ (($env{'form.grade_username'} eq $env{'user.name'}) &&
+ ($env{'form.grade_domain'} eq $env{'user.domain'}))) {
+ $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"};
+ } else {
+ unless (($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurvey') ||
+ ($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurveycred')) {
+ $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"};
+ }
+ }
+ }
+ my %lastresponse=&Apache::lonnet::str2hash($lastresponse);
+ my @alp = splice @alphabet, 0, $#whichopt + 1;
+ my $internal_counter=$Apache::lonxml::counter;
+ my ($numrows,$bubbles_per_row);
+ if (($target eq 'tex') && ($Apache::lonhomework::type eq 'exam')) {
+ ($numrows,$bubbles_per_row) =
+ &Apache::optionresponse::getnumrows(scalar(@alp));
+ } else {
+ $numrows = 1;
+ }
+ if($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes') {
+ $result .= '\strut \\\\ \strut \\\\' ;
+ }
+ foreach my $name (@whichfoils) {
my $lastopt=$lastresponse{$name};
- my $optionlist="\n";
+ my $text=$Apache::response::foilgroup{$name.'.text'};
+ my $optionlist='';
+ if ($target ne 'tex') {
+ $optionlist = "\n";
+ }
+ if ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes') {
+ my $fieldname = $env{'request.symb'}.'&part_'.$Apache::inputtags::part.'&rankresponse'.'&HWVAL_'.$Apache::inputtags::response['-1'].':'.$temp;
+ $optionlist = &Apache::lonxml::print_pdf_start_combobox($fieldname);
+ }
my $option;
foreach $option (@whichopt) {
if ($option eq $lastopt) {
- $optionlist.="\n";
+ if ($target ne 'tex' ) {
+ $optionlist.="\n";
+ } elsif ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes') {
+ $optionlist .= &Apache::lonxml::print_pdf_add_combobox_option($option);
+ }
+ } else {
+ if ($target ne 'tex') {
+ $optionlist.="\n";
+ } elsif ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes') {
+ $optionlist .= &Apache::lonxml::print_pdf_add_combobox_option($option);
+ }
+ }
+ }
+ if ($target ne 'tex' && $Apache::lonhomework::type ne 'exam') {
+ my $labeltext = &mt('Choose ranking for:').' '.$text;
+ $optionlist='\n";
+ } elsif ($env{'form.pdfFormFields'} eq 'yes') {
+ #do nothing
+ } else {
+ $optionlist=' '.$temp.' '.$optionlist.' ';
+ }
+ if ($target ne 'tex') {
+ $result .= '
';
+ if ($Apache::lonhomework::type ne 'exam') {
+ $result.=$optionlist.$text."\n";
} else {
- $optionlist.="\n";
+ $result.=$text."\n";
+ }
+ if ($Apache::lonhomework::type eq 'exam') {
+ my @values=(1..scalar(@whichopt));
+ $result.=&Apache::optionresponse::webbubbles(\@values,\@whichopt,$temp,$lastopt);
+ }
+ $result .= '
';
+ } else {
+ if ($Apache::lonhomework::type eq 'exam') {
+ my $itemlabel;
+ if ($numrows == 1) {
+ $itemlabel = '\item[\textbf{'.$internal_counter.'}]';
+ } else {
+ my $linetext;
+ for (my $i=0; $i<$numrows; $i++) {
+ $linetext .= $internal_counter+$i.', ';
+ }
+ $linetext =~ s/,\s$//;
+ $itemlabel = '\item[\small {\textbf{'.$linetext.'}}]'.
+ ' {\footnotesize '.
+ &mt('(Bubble once in [_1] lines)',$numrows).
+ '} \hspace*{\fill} \\\\';
+ }
+ $result .= '\vskip 0 mm '.$text.' \vskip 0 mm '."\n";
+ $result .= '\vskip -1 mm';
+ $result .= '\begin{enumerate}'.$itemlabel;
+ $result .= &Apache::optionresponse::bubbles(\@alp,\@whichopt,'rankresponse',undef,$numrows,$bubbles_per_row,$internal_counter);
+ $result .= '\end{enumerate} \vskip -8 mm \strut ';
+ $internal_counter += $numrows;
+ } else {
+ if($env{'form.pdfFormFields'} ne 'yes') {
+ $result.=' \vskip 0mm \framebox[5 mm][s]{\tiny\strut} '.$text."\n";
+ } else {
+ $result.= $optionlist.' '. &Apache::lonxml::print_pdf_end_combobox($text).'\strut \\\\';
+ }
}
}
- $optionlist='\n";
- my $text=$Apache::response::foilgroup{$name.'.text'};
- $result.=' '.$optionlist.$text."\n";
$temp++;
}
}
- $result.=" ";
+ 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,
+ [\@whichfoils,
+ 'submissiongrading'],
+ $questiontype);
+ }
+ if ($target ne 'tex') {$result.=" ";} else {$result.=' \vskip 0 mm ';}
return $result;
}
@@ -285,52 +515,9 @@ sub getfoilcounts {
sub whichfoils {
my ($max,$randomize)=@_;
- $max = &getfoilcounts($max);
- # &Apache::lonxml::debug("man $max randomize $randomize");
- if (!defined(@{ $Apache::response::foilgroup{'names'} })) { return; }
- my @names = @{ $Apache::response::foilgroup{'names'} };
- my @whichopt =();
- my (%top,@toplist,%bottom,@bottomlist);
- if (!(&Apache::response::showallfoils() || ($randomize eq 'no'))) {
- my $current=0;
- foreach my $name (@names) {
- $current++;
- if ($Apache::response::foilgroup{"$name.location"} eq 'top') {
- $top{$name}=$current;
- } elsif ($Apache::response::foilgroup{"$name.location"} eq
- 'bottom') {
- $bottom{$name}=$current;
- }
- }
- }
- while ((($#whichopt+1) < $max) && ($#names > -1)) {
-# &Apache::lonxml::debug("Have $#whichopt max is $max");
- my $aopt;
- if (&Apache::response::showallfoils() || ($randomize eq 'no')) {
- $aopt=0;
- } else {
- $aopt=int(&Math::Random::random_uniform() * ($#names+1));
- }
-# &Apache::lonxml::debug("From $#whichopt $max $#names elms, picking $aopt");
- $aopt=splice(@names,$aopt,1);
-# &Apache::lonxml::debug("Picked $aopt");
- if ($top{$aopt}) {
- $toplist[$top{$aopt}]=$aopt;
- } elsif ($bottom{$aopt}) {
- $bottomlist[$bottom{$aopt}]=$aopt;
- } else {
- push (@whichopt,$aopt);
- }
- }
-# &Apache::lonxml::debug("Grr, ".$#whichopt.":".$#toplist.':'.$#bottomlist);
- for (my $i=0;$i<=$#toplist;$i++) {
- if ($toplist[$i]) { unshift(@whichopt,$toplist[$i]) }
- }
- for (my $i=0;$i<=$#bottomlist;$i++) {
- if ($bottomlist[$i]) { push(@whichopt,$bottomlist[$i]) }
- }
- &Apache::lonxml::debug("Grr, ".$#whichopt.":".$#toplist.':'.$#bottomlist);
- return @whichopt;
+ return &Apache::response::whichorder($max,$randomize,
+ &Apache::response::showallfoils(),
+ \%Apache::response::foilgroup);
}
sub start_conceptgroup {
@@ -356,31 +543,13 @@ sub end_conceptgroup {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
$Apache::rankresponse::conceptgroup=0;
my $result='';
- if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ) {
+ if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
+ $target eq 'tex' || $target eq 'analyze') {
#if not there aren't any foils to display and thus no question
- if (defined(@{ $Apache::response::conceptgroup{'names'} })) {
- my @names = @{ $Apache::response::conceptgroup{'names'} };
- my $pick=int(&Math::Random::random_uniform() * ($#names+1));
- my $name=$names[$pick];
- push @{ $Apache::response::foilgroup{'names'} }, $name;
- $Apache::response::foilgroup{"$name.value"} =
- $Apache::response::conceptgroup{"$name.value"};
- $Apache::response::foilgroup{"$name.text"} =
- $Apache::response::conceptgroup{"$name.text"};
- $Apache::response::foilgroup{"$name.location"} =
- $Apache::response::conceptgroup{"$name.location"};
- my $concept = &Apache::lonxml::get_param('concept',$parstack,
- $safeeval);
- $Apache::response::foilgroup{"$name.concept"} = $concept;
- &Apache::lonxml::debug("Selecting $name in $concept");
- if ($target eq 'web') {
- my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
- push(@{ $Apache::hint::rank{"$part_id.concepts"} },
- $concept);
- $Apache::hint::rank{"$part_id.concept.$concept"}=
- $Apache::response::conceptgroup{'names'};
- }
- }
+ &Apache::response::pick_foil_for_concept($target,
+ ['value','text','location'],
+ \%Apache::hint::rank,
+ $parstack,$safeeval);
} elsif ($target eq 'edit') {
$result=&Apache::edit::end_table();
}
@@ -395,8 +564,11 @@ sub insert_conceptgroup {
sub start_foil {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
- if ($target eq 'web' ) {
+ if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {
&Apache::lonxml::startredirection;
+ if ($target eq 'analyze') {
+ &Apache::response::check_if_computed($token,$parstack,$safeeval,'value');
+ }
} elsif ($target eq 'edit') {
$result=&Apache::edit::tag_start($target,$token,"Foil");
my $level='-2';
@@ -423,17 +595,29 @@ sub end_foil {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $text ='';
my $result = '';
- if ($target eq 'web') {
+ if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {
$text=&Apache::lonxml::endredirection;
}
- if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') {
+ if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
+ $target eq 'tex' || $target eq 'analyze') {
my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval);
+ if ($target eq 'tex' && $Apache::lonhomework::type eq 'exam') {
+ $text='\vskip 5mm $\triangleright$ '.$text;
+ }
if ($value ne 'unused') {
my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
- my $location =&Apache::lonxml::get_param('location',$parstack,$safeeval);
&Apache::lonxml::debug("Got a name of :$name:");
- if (!$name) { $name=$Apache::lonxml::curdepth; }
+ if ($name eq "") {
+ &Apache::lonxml::warning(&mt('Foils without names exist. This can cause problems to malfunction.'));
+ $name=$Apache::lonxml::curdepth;
+ }
&Apache::lonxml::debug("Using a name of :$name:");
+ if (defined($Apache::response::foilnames{$name})) {
+ &Apache::lonxml::error(&mt('Foil name [_1] appears more than once. Foil names need to be unique.',''.$name.''));
+ }
+ $Apache::response::foilnames{$name}++;
+ my $location =&Apache::lonxml::get_param('location',$parstack,
+ $safeeval);
if ( $Apache::rankresponse::conceptgroup
&& !&Apache::response::showallfoils() ) {
push @{ $Apache::response::conceptgroup{'names'} }, $name;