--- loncom/homework/rankresponse.pm 2008/02/01 22:05:45 1.56
+++ loncom/homework/rankresponse.pm 2011/06/07 17:27:37 1.65
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# rank style response
#
-# $Id: rankresponse.pm,v 1.56 2008/02/01 22:05:45 raeburn Exp $
+# $Id: rankresponse.pm,v 1.65 2011/06/07 17:27:37 www Exp $
# Copyright Michigan State University Board of Trustees
#
# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
@@ -30,6 +30,8 @@ use strict;
use HTML::Entities();
use Apache::optionresponse();
use Apache::lonlocal;
+use Apache::lonxml;
+use Apache::lonnet;
BEGIN {
&Apache::lonxml::register('Apache::rankresponse',('rankresponse'));
@@ -48,15 +50,17 @@ sub start_rankresponse {
if ($target eq 'meta') {
$result=&Apache::response::meta_package_write('rankresponse');
} elsif ($target eq 'edit' ) {
- $result.=&Apache::edit::start_table($token).
- '<tr><td>'.&Apache::lonxml::description($token)."</td><td>Delete:".
- &Apache::edit::deletelist($target,$token)
- ."</td><td> ".&Apache::edit::end_row()
- .&Apache::edit::start_spanning_row();
+ $result.=&Apache::edit::start_table($token)
+ .'<tr><td>'.&Apache::lonxml::description($token).'</td>'
+ .'<td><span class="LC_nobreak">'.&mt('Delete?').' '
+ .&Apache::edit::deletelist($target,$token)
+ .'</span></td>'
+ .'<td> '.&Apache::edit::end_row()
+ .&Apache::edit::start_spanning_row();
$result.=
&Apache::edit::text_arg('Max Number Of Shown Foils:','max',$token,'4').
- &Apache::edit::select_arg('Randomize Foil Order','randomize',
+ &Apache::edit::select_arg('Randomize Foil Order:','randomize',
['yes','no'],$token).
&Apache::edit::end_row().&Apache::edit::start_spanning_row()."\n";
} elsif ($target eq 'modified') {
@@ -92,7 +96,7 @@ sub start_foilgroup {
my $result;
%Apache::response::foilgroup=();
$Apache::rankresponse::conceptgroup=0;
- &Apache::response::pushrandomnumber();
+ &Apache::response::pushrandomnumber(undef,$target);
return $result;
}
@@ -261,12 +265,26 @@ sub grade_response {
$ad='MISSING_ANSWER';
}
}
- if ($Apache::lonhomework::type eq 'survey' &&
- ($ad eq 'INCORRECT' || $ad eq 'EXACT_ANS') ) {
- $ad='SUBMITTED';
+ if (($ad eq 'INCORRECT' || $ad eq 'EXACT_ANS')) {
+ if ($Apache::lonhomework::type eq 'survey') {
+ $ad='SUBMITTED';
+ } elsif ($Apache::lonhomework::type eq 'surveycred') {
+ $ad='SUBMITTED_CREDIT';
+ } elsif ($Apache::lonhomework::type eq 'anonsurvey') {
+ $ad='ANONYMOUS';
+ } elsif ($Apache::lonhomework::type eq 'anonsurveycred') {
+ $ad='ANONYMOUS_CREDIT';
+ } else {
+ $Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}=$gradestr;
+ }
} else {
$Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}=$gradestr;
}
+ if ($Apache::lonhomework::type eq 'randomizetry') {
+ if ($Apache::lonhomework::type eq 'randomizetry') {
+ $Apache::lonhomework::results{"resource.$part.$id.foilorder"} = &Apache::lonnet::array2str(@whichfoils);
+ }
+ }
$Apache::lonhomework::results{"resource.$part.$id.submission"}=
$responsestr;
$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad;
@@ -313,28 +331,58 @@ sub displayfoils {
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,$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 (((($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurvey') || ($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurveycred')) && (defined($env{'form.grade_symb'}))) || $newvariation) {
+ $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;
- foreach my $name (@whichfoils) {
+ if($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes') {
+ $result .= '\strut \\\\ \strut \\\\' ;
+ }
+ foreach my $name (@whichfoils) {
my $lastopt=$lastresponse{$name};
my $optionlist='';
- if ($target ne 'tex') {$optionlist="<option></option>\n";}
+ if ($target ne 'tex') {
+ $optionlist = "<option></option>\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) {
- if ($target ne 'tex') {$optionlist.="<option selected=\"on\">$option</option>\n";}
+ if ($target ne 'tex' ) {
+ $optionlist.="<option selected=\"selected\">$option</option>\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.="<option>$option</option>\n";}
- }
+ if ($target ne 'tex') {
+ $optionlist.="<option>$option</option>\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') {
$optionlist='<select onchange="javascript:setSubmittedPart(\''.
$part.'\');" name="HWVAL_'.
$Apache::inputtags::response[-1].':'.$temp.'">'.
$optionlist."</select>\n";
- } else {
+ } elsif ($env{'form.pdfFormFields'} eq 'yes') {
+ #do nothing
+ } else {
$optionlist=' '.$temp.' '.$optionlist.' ';
}
my $text=$Apache::response::foilgroup{$name.'.text'};
@@ -350,20 +398,32 @@ sub displayfoils {
}
} else {
if ($Apache::lonhomework::type eq 'exam') {
- $result.='\vskip 0 mm '.$text.' \vskip 0 mm '."\n";
- $result.='\vskip -1 mm\noindent\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]'.&Apache::optionresponse::bubbles(\@alp,\@whichopt,'rankresponse').'\end{enumerate} \vskip -8 mm \strut ';
+ $result .= '\vskip 0 mm '.$text.' \vskip 0 mm '."\n";
+ $result .= '\vskip -1 mm';
+ $result .= '\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]';
+ $result .= &Apache::optionresponse::bubbles(\@alp,\@whichopt,'rankresponse');
+ $result .= '\end{enumerate} \vskip -8 mm \strut ';
$internal_counter++;
} else {
- $result.=' \vskip 0mm \framebox[5 mm][s]{\tiny\strut} '.$text."\n";
+ 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 \\\\';
+ }
}
}
$temp++;
}
}
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']);
+ 'submissiongrading'],
+ $questiontype);
}
if ($target ne 'tex') {$result.="<br />";} else {$result.=' \vskip 0 mm ';}
return $result;
@@ -474,12 +534,15 @@ sub end_foil {
my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
&Apache::lonxml::debug("Got a name of :$name:");
if ($name eq "") {
- &Apache::lonxml::warning("Foils without names exist. This can cause problems to malfunction.");
+ &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 ($name eq "0") {
+ &Apache::lonxml::error(&mt('Foil name [_1] is not supported. Please choose another name.','<b><tt>'.$name.'</tt></b>'));
+ }
if (defined($Apache::response::foilnames{$name})) {
- &Apache::lonxml::error(&mt("Foil name <b><tt>[_1]</tt></b> appears more than once. Foil names need to be unique.",$name));
+ &Apache::lonxml::error(&mt('Foil name [_1] appears more than once. Foil names need to be unique.','<b><tt>'.$name.'</tt></b>'));
}
$Apache::response::foilnames{$name}++;
my $location =&Apache::lonxml::get_param('location',$parstack,