';
+ $result .= $td.&mt('Answer for Part: [_1]',
+ $Apache::inputtags::part).'';
}
$result .= "\n";
+ $need_row_start = 0;
+ }
+ return $result;
+}
+
+sub next_answer {
+ my ($type) = @_;
+ my $result;
+ if ($env{'form.answer_output_mode'} eq 'tex') {
+ # FIXME ... need to do something with tex mode
+ } else {
+ $result .= "
";
+ $need_row_start = 1;
}
return $result;
}
sub answer_part {
- my ($type,$answer) = @_;
+ my ($type,$answer,$args) = @_;
my $result;
if ($env{'form.answer_output_mode'} eq 'tex') {
- my $to_use='|';
- foreach my $value (32..126) {
- my $char=pack('c',$value);
- if ($answer !~ /\Q$char\E/) {
- $to_use=$char;
- last;
+ if (!$args->{'no_verbatim'}) {
+ my $to_use='|';
+ foreach my $value (32..126) {
+ my $char=pack('c',$value);
+ if ($answer !~ /\Q$char\E/) {
+ $to_use=$char;
+ last;
+ }
}
+ my $fullanswer=$answer;
+ $answer='';
+ foreach my $element (split(/[\;]/,$fullanswer)) {
+ if ($element ne '') {
+ $answer.= '\verb'.$to_use.$element.$to_use.' \newline';
+ }
+ }
}
if ($answer ne '') {
- push(@answer_bits,'\verb'.$to_use.$answer.$to_use);
+ push(@answer_bits,$answer);
}
} else {
- $result = '
'.$answer.'
';
+ if ($need_row_start) {
+ $result .= '
';
+ $need_row_start = 0;
+ }
+ $result .= '
'.$answer.'
';
}
return $result;
}
@@ -737,12 +908,17 @@ sub answer_footer {
my ($type) = @_;
my $result;
if ($env{'form.answer_output_mode'} eq 'tex') {
- my $columns = scalar(@answer_bits);
- $result = ' \vskip 0 mm \noindent \begin{tabular}{|'.'c|'x$columns.'}\hline ';
- $result .= join(' & ',@answer_bits);
- $result .= ' \\\\ \\hline \end{tabular} \vskip 0 mm ';
+ $result = ' \vskip 0 mm \noindent \begin{tabular}{|p{1.5cm}|p{6.8cm}|}\hline ';
+ $result .= $answer_bits[0].'&\vspace*{-4mm}\begin{itemize}';
+ for (my $i=1;$i<=$#answer_bits;$i++) {
+ $result.='\item '.$answer_bits[$i].'\vspace*{-7mm}';
+ }
+ $result .= ' \end{itemize} \\\\ \hline \end{tabular} \vskip 0 mm ';
} else {
- $result = '
';
+ if (!$need_row_start) {
+ $result .= '';
+ }
+ $result .= '';
}
return $result;
}
@@ -751,7 +927,7 @@ sub answer_footer {
sub showallfoils {
if (defined($env{'form.showallfoils'})) {
- my ($symb)=&Apache::lonxml::whichuser();
+ my ($symb)=&Apache::lonnet::whichuser();
if (($env{'request.state'} eq 'construct') ||
($env{'user.adv'} && $symb eq '') ||
($Apache::lonhomework::viewgrades) ) {
@@ -759,17 +935,51 @@ sub showallfoils {
}
}
if ($Apache::lonhomework::type eq 'survey') { return 1; }
+ if ($Apache::lonhomework::type eq 'surveycred') { return 1; }
+ if ($Apache::lonhomework::type eq 'anonsurvey') { return 1; }
+ if ($Apache::lonhomework::type eq 'anonsurveycred') { return 1; }
+
return 0;
}
+=pod
+
+=item &getresponse();
+
+Retreives the current submitted response, helps out in the case of
+scantron mode.
+
+Returns either the exact text of the submission, or a bubbled response
+converted to something usable.
+
+Optional Arguments:
+ $offset - (defaults to 1) if a problem has more than one bubble
+ response, pass in the number of the bubble wanted, (the
+ first bubble associated with a problem has an offset of 1,
+ the second bubble is 2
+
+ $resulttype - undef -> a number between 0 and 25
+ 'A is 1' -> a number between 1 and 26
+ 'letter' -> a letter between 'A' and 'Z'
+ $lines - undef problem only needs a single line of bubbles.
+ nonzero Problem wants the first nonempty response in
+ $lines lines of bubbles.
+ $bubbles_per_line - Must be provided if lines is defined.. number of
+ bubbles on a line.
+
+=cut
+
sub getresponse {
- my ($temp,$resulttype)=@_;
+ my ($offset,$resulttype, $lines, $bubbles_per_line)=@_;
my $formparm='form.HWVAL_'.$Apache::inputtags::response['-1'];
my $response;
- if (!defined($temp)) {
- $temp=1;
+ if (!defined($offset)) {
+ $offset=1;
} else {
- $formparm.=":$temp";
+ $formparm.=":$offset";
+ }
+ if (!defined($lines)) {
+ $lines = 1;
}
my %let_to_num=('A'=>0,'B'=>1,'C'=>2,'D'=>3,'E'=>4,'F'=>5,'G'=>6,'H'=>7,
'I'=>8,'J'=>9,'K'=>10,'L'=>11,'M'=>12,'N'=>13,'O'=>14,
@@ -778,41 +988,140 @@ sub getresponse {
if ($env{'form.submitted'} eq 'scantron') {
my $part = $Apache::inputtags::part;
my $id = $Apache::inputtags::response[-1];
- $response = $env{'scantron.'.($Apache::lonxml::counter+$temp-1).
- '.answer'};
+
+ my $line;
+ my $startline = $env{'form.scantron_questnum_start.'.$part.'.'.$id};
+ if (!$startline) {
+ $startline = $Apache::lonxml::counter;
+ }
+ for ($line = 0; $line < $lines; $line++) {
+ my $theline = $startline+$offset-1+$line;
+ $response = $env{"scantron.$theline.answer"};
+ if ((defined($response)) && ($response ne "") && ($response ne " ")) {
+ last;
+ }
+
+ }
+
# save bubbled letter for later
$Apache::lonhomework::results{"resource.$part.$id.scantron"}.=
$response;
if ($resulttype ne 'letter') {
- if ($resulttype eq 'A is 1') {
- $response = $let_to_num{$response}+1;
- } else {
- $response = $let_to_num{$response};
+ $response = $let_to_num{$response};
+ if ($resulttype eq 'A is 1') {
+ if ($response ne "") {
+ $response = $response+1;
+ }
+ }
+ if ($response ne "") {
+ $response += $line * $bubbles_per_line;
+ }
+ } else {
+ if ($response ne "") {
+ my $raw = $response;
+ $response = chr(ord($response) + $line * $bubbles_per_line);
}
}
+
} else {
$response = $env{$formparm};
}
+ #
+ # If we have a nonempty answer, correct the numeric value
+ # of the answer for the line on which it was found.
+ #
+
return $response;
}
+=pod
+
+=item &repetition();
+
+In scalar context:
+
+returns: the number of lines that are required to encode the weight.
+(Default is for 10 bubbles per bubblesheet item; other (integer)
+values can be specified by using a custom Bubblesheet format file
+with an eighteenth entry (BubblesPerRow) set to the integer
+appropriate for the bubblesheets which will be used to assign weights.
+
+In array context:
+
+returns: number of lines required to encode weight, and bubbles/line.
+
+=cut
+
sub repetition {
my $id = $Apache::inputtags::part;
my $weight = &Apache::lonnet::EXT("resource.$id.weight");
if (!defined($weight) || ($weight eq '')) { $weight=1; }
- my $repetition = int($weight/10);
- if ($weight % 10 != 0) { $repetition++; }
+ my $bubbles_per_row;
+ if (($env{'form.bubbles_per_row'} =~ /^\d+$/) &&
+ ($env{'form.bubbles_per_row'} > 0)) {
+ $bubbles_per_row = $env{'form.bubbles_per_row'};
+ } else {
+ $bubbles_per_row = 10;
+ }
+ my $denominator = $bubbles_per_row;
+ if (($env{'form.scantron_lastbubblepoints'} == 0) &&
+ ($bubbles_per_row > 1)) {
+ $denominator = $bubbles_per_row - 1;
+ }
+ my $repetition = int($weight/$denominator);
+ if ($weight % $denominator != 0) { $repetition++; }
+ if (wantarray) {
+ return ($repetition,$bubbles_per_row);
+ }
return $repetition;
+
}
+=pod
+
+=item &scored_response();
+
+Sets the results hash elements
+
+ resource.$part_id.$response_id.awarded - to the floating point
+ number between 0 and 1 that was awarded on the bubbled input
+
+ resource.$part_id.$response_id.awarddetail - to 'ASSIGNED_SCORE'
+
+Returns
+
+ the number of bubble sheet lines that were used (and likely need to
+ be passed to &Apache::lonxml::increment_counter()
+
+Arguments
+
+ $part_id - id of the part to grade
+ $response_id - id of the response to grade
+
+
+=cut
+
sub scored_response {
my ($part,$id)=@_;
my $repetition=&repetition();
+ my $bubbles_per_row;
+ if (($env{'form.bubbles_per_row'} =~ /^\d+$/) &&
+ ($env{'form.bubbles_per_row'} > 0)) {
+ $bubbles_per_row = $env{'form.bubbles_per_row'};
+ } else {
+ $bubbles_per_row = 10;
+ }
my $score=0;
for (my $i=0;$i<$repetition;$i++) {
- # A is 1, B is 2, etc. (get response return 0-9 and then we add 1)
+ # A is 1, B is 2, etc.
my $increase=&Apache::response::getresponse($i+1);
- if ($increase ne '') { $score+=$increase+1; }
+ unless (($increase == $bubbles_per_row-1) &&
+ ($env{'form.scantron_lastbubblepoints'} == 0)) {
+ # (get response return 0-9 and then we add 1)
+ if ($increase ne '') {
+ $score+=$increase+1;
+ }
+ }
}
my $weight = &Apache::lonnet::EXT("resource.$part.weight");
if (!defined($weight) || $weight eq '' || $weight eq 0) { $weight = 1; }
@@ -824,10 +1133,13 @@ sub scored_response {
}
sub whichorder {
- my ($max,$randomize,$showall,$hash)=@_;
+ my ($max,$randomize,$showall,$hash,$rndseed)=@_;
#&Apache::lonxml::debug("man $max randomize $randomize");
- if (!defined(@{ $$hash{'names'} })) { return; }
- my @names = @{ $$hash{'names'} };
+ my @names;
+ if (ref($hash->{'names'}) eq 'ARRAY') {
+ @names = @{$hash->{'names'}};
+ }
+ return if (!@names);
my @whichopt =();
my (%top,@toplist,%bottom,@bottomlist);
if (!($showall || ($randomize eq 'no'))) {
@@ -878,9 +1190,15 @@ sub show_answer {
my $part = $Apache::inputtags::part;
my $award = $Apache::lonhomework::history{"resource.$part.solved"};
my $status = $Apache::inputtags::status[-1];
- return ( ($award =~ /^correct/
- && lc($Apache::lonhomework::problemstatus) ne 'no')
- || $status eq "SHOW_ANSWER");
+ my $canshow = 0;
+ if ($award =~ /^correct/) {
+ if (($Apache::lonhomework::history{"resource.$part.awarded"} >= 1) ||
+ (&Apache::lonnet::EXT("resource.$part.retrypartial") !~/^1|on|yes$/)) {
+ $canshow = 1;
+ }
+ }
+ return (($canshow && &Apache::lonhomework::show_problem_status())
+ || $status eq "SHOW_ANSWER");
}
sub analyze_store_foilgroup {
@@ -908,8 +1226,11 @@ sub check_if_computed {
sub pick_foil_for_concept {
my ($target,$attrs,$hinthash,$parstack,$safeeval)=@_;
- if (not defined(@{ $Apache::response::conceptgroup{'names'} })) { return; }
- my @names = @{ $Apache::response::conceptgroup{'names'} };
+ my @names;
+ if (ref($Apache::response::conceptgroup{'names'}) eq 'ARRAY') {
+ @names = @{ $Apache::response::conceptgroup{'names'} };
+ }
+ return if (!@names);
my $pick=int(&Math::Random::random_uniform() * ($#names+1));
my $name=$names[$pick];
push @{ $Apache::response::foilgroup{'names'} }, $name;
@@ -941,6 +1262,19 @@ sub pick_foil_for_concept {
}
+=pod
+
+=item get_response_param()
+
+Get a parameter associated with a problem.
+Parameters:
+ $id - the id of the paramater, either a part id,
+ or a partid and responspe id joined by _
+ $name - Name of the parameter to fetch
+ $default - Default value for the paramter.
+
+=cut
+
sub get_response_param {
my ($id,$name,$default)=@_;
my $parameter;
@@ -965,15 +1299,21 @@ sub submitted {
if ($who eq 'scantron') { return 0; }
# if the Submit Answer button for this particular part was pressed
my $partid=$Apache::inputtags::part;
- if (defined($env{'form.submit_'.$partid})) { return 1; }
+ if ($env{'form.submitted'} eq "part_$partid") {
+ return 1;
+ }
+ if ($env{'form.submitted'} eq "yes"
+ && defined($env{'form.submit_'.$partid})) {
+ return 1;
+ }
# Submit All button on a .page was pressed
if (defined($env{'form.all_submit'})) { return 1; }
- # otherwise no submission occured
+ # otherwise no submission occurred
return 0;
}
sub add_to_gradingqueue {
- my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
+ my ($symb,$courseid,$domain,$name) = &Apache::lonnet::whichuser();
if ( $courseid eq ''
|| $symb eq ''
|| $env{'request.state'} eq 'construct'
@@ -995,20 +1335,29 @@ sub add_to_gradingqueue {
}
}
-# basically undef and 0 (both false) mean that they still have work to do
-# and all true values mean that they can't do any more work
-#
-# a return of undef means it is unattempted
-# a return of 0 means it is attmpted and wrong but still has tries
-# a return of 1 means it is marked correct
-# a return of 2 means they have exceed maximum number of tries
-# a return of 3 means it after the answer date
+=pod
+
+=item check_status()
+
+basically undef and 0 (both false) mean that they still have work to do
+and all true values mean that they can't do any more work
+
+ a return of undef means it is unattempted
+ a return of 0 means it is both attempted and still has tries and
+ is wrong or is only partially correct, and retries
+ are allowed.
+ a return of 1 means it is marked correct
+ a return of 2 means they have exceeded maximum number of tries
+ a return of 3 means it is after the answer date
+
+=cut
+
sub check_status {
my ($id)=@_;
if (!defined($id)) { $id=$Apache::inputtags::part; }
my $curtime=&Apache::lonnet::EXT('system.time');
my $opendate=&Apache::lonnet::EXT("resource.$id.opendate");
- my $duedate=&Apache::lonnet::EXT("resource.$id.duedate");
+ my $duedate=&Apache::lonhomework::due_date($id);
my $answerdate=&Apache::lonnet::EXT("resource.$id.answerdate");
if ( $opendate && $curtime > $opendate &&
$duedate && $curtime > $duedate &&
@@ -1016,7 +1365,13 @@ sub check_status {
return 3;
}
my $status=&Apache::lonnet::EXT("user.resource.resource.$id.solved");
- if ($status =~ /^correct/) { return 1; }
+ if ($status =~ /^correct/) {
+ my $awarded=&Apache::lonnet::EXT("user.resource.resource.$id.awarded");
+ my $retrypartial=&Apache::lonnet::EXT("resource.$id.retrypartial");
+ unless (($retrypartial =~ /^1|on|yes$/) && ($awarded <1)) {
+ return 1;
+ }
+ }
if (!$status) { return undef; }
my $maxtries=&Apache::lonnet::EXT("resource.$id.maxtries");
if ($maxtries eq '') { $maxtries=2; }
@@ -1025,6 +1380,66 @@ sub check_status {
return 2;
}
+=pod
+
+=item setup_prior_tries_hash()
+
+ Foreach each past .submission $func is called with 3 arguments
+ - the mode to set things up for (currently always 'grade')
+ - the stored .submission string
+ - The expansion of $data
+
+ $data is an array ref containing elements that are either
+ - scalars that are other elements of the history hash to pass to $func
+ - ref to data to be passed untouched to $func
+
+ $questiontype is the questiontype (currently only passed in if
+ randomizebytry.
+
+=cut
+
+sub setup_prior_tries_hash {
+ my ($func,$data,$questiontype) = @_;
+ my $part = $Apache::inputtags::part;
+ my $id = $Apache::inputtags::response[-1];
+ foreach my $i (1..$Apache::lonhomework::history{'version'}) {
+ my $partprefix = "$i:resource.$part";
+ my $sub_key = "$partprefix.$id.submission";
+ next if (!exists($Apache::lonhomework::history{$sub_key}));
+ my $type_key = "$partprefix.type";
+ my $type = $Apache::lonhomework::history{$type_key};
+ my @other_data;
+ if (ref($data) eq 'ARRAY') {
+ foreach my $datum (@{ $data }) {
+ if (ref($datum)) {
+ push(@other_data,$datum);
+ } else {
+ my $info_key = "$i:resource.$part.$id.$datum";
+ push(@other_data,$Apache::lonhomework::history{$info_key});
+ }
+ }
+ }
+ if ($questiontype eq 'randomizetry') {
+ my $order_key = "$partprefix.$id.foilorder";
+ my @whichopts = &Apache::lonnet::str2array($Apache::lonhomework::history{$order_key});
+ if (@whichopts > 0) {
+ shift(@other_data);
+ unshift(@other_data,\@whichopts);
+ }
+ }
+ my $output =
+ &$func('grade',
+ $Apache::lonhomework::history{$sub_key},
+ \@other_data);
+ if (defined($output)) {
+ $Apache::inputtags::submission_display{$sub_key} = $output;
+ }
+ }
+}
+
1;
__END__
+=pod
+
+=cut