--- loncom/homework/response.pm 2006/01/21 08:17:51 1.135
+++ loncom/homework/response.pm 2008/11/25 13:16:17 1.208
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# various response type definitons response definition
#
-# $Id: response.pm,v 1.135 2006/01/21 08:17:51 albertel Exp $
+# $Id: response.pm,v 1.208 2008/11/25 13:16:17 jms Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -26,19 +26,42 @@
# http://www.lon-capa.org/
#
+=pod
+
+=head1 NAME
+
+Apache::resonse.pm
+
+=head1 SYNOPSIS
+
+This is part of the LearningOnline Network with CAPA project
+described at http://www.lon-capa.org.
+
+
+=head1 NOTABLE SUBROUTINES
+
+=over
+
+=item
+
+=back
+
+=cut
+
+
package Apache::response;
use strict;
use Apache::lonlocal;
use Apache::lonnet;
+use Apache::lonmaxima();
BEGIN {
- &Apache::lonxml::register('Apache::response',('responseparam','parameter','dataresponse','customresponse'));
+ &Apache::lonxml::register('Apache::response',('responseparam','parameter','dataresponse','customresponse','mathresponse'));
}
sub start_response {
my ($parstack,$safeeval)=@_;
- my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
- if ($id eq '') { $id = $Apache::lonxml::curdepth; }
+ my $id = &Apache::lonxml::get_id($parstack,$safeeval);
if ($#Apache::inputtags::import > -1) {
&Apache::lonxml::debug("Turning :$id: into");
$id = join('_',@Apache::inputtags::import).'_'.$id;
@@ -69,8 +92,7 @@ sub end_response {
sub start_hintresponse {
my ($parstack,$safeeval)=@_;
- my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
- if ($id eq '') { $id = $Apache::lonxml::curdepth; }
+ my $id = &Apache::lonxml::get_id($parstack,$safeeval);
push (@Apache::inputtags::hint,$id);
push (@Apache::inputtags::hintlist,$id);
push (@Apache::inputtags::paramstack,[%Apache::inputtags::params]);
@@ -130,11 +152,13 @@ sub setrandomnumber {
}
$shift_amt=scalar(@Apache::inputtags::responselist);
} elsif ($Apache::lonhomework::parsing_a_task) {
- $id1=$Apache::bridgetask::dimension;
- if (!$ignore_id2 && defined($Apache::bridgetask::instance[-1])) {
- $id2=$Apache::bridgetask::instance[-1];
+ $id1=&Apache::bridgetask::get_dim_id();
+ if (!$ignore_id2 && ref($Apache::bridgetask::instance{$id1})) {
+ $id2=$Apache::bridgetask::instance{$id1}[-1];
+ $shift_amt=scalar(@{$Apache::bridgetask::instance{$id1}});
+ } else {
+ $shift_amt=0;
}
- $shift_amt=scalar(@Apache::bridgetask::instance);
}
&Apache::lonxml::debug("id1: $id1, id2: $id2, shift_amt: $shift_amt");
if (!$rand_alg || $rand_alg eq '32bit' || $rand_alg eq '64bit' ||
@@ -216,23 +240,26 @@ sub meta_stores_write {
}
sub mandatory_part_meta {
-#
-# Autogenerate metadata for mandatory
-# input (from RAT or lonparmset) and
-# output (to lonspreadsheet)
-# of each part
+=pod
+
+=item meta_part_order
+
+Autogenerate metadata for mandatory
+input (from RAT or lonparmset) and
+output (to lonspreadsheet)
+of each part
#
return
-# &meta_parameter_write('opendate','date_start','',
-# 'Opening Date').
-# &meta_parameter_write('duedate','date_end','',
-# 'Due Date').
-# &meta_parameter_write('answerdate','date_start','',
-# 'Show Answer Date').
-# &meta_parameter_write('weight','int_zeropos','',
-# 'Available Points').
-# &meta_parameter_write('maxtries','int_pos','',
-# 'Maximum Number of Tries').
+ &meta_parameter_write('opendate','date_start','',
+ 'Opening Date').
+ &meta_parameter_write('duedate','date_end','',
+ 'Due Date').
+ &meta_parameter_write('answerdate','date_start','',
+ 'Show Answer Date').
+ &meta_parameter_write('weight','int_zeropos','',
+ 'Available Points').
+ &meta_parameter_write('maxtries','int_pos','',
+ 'Maximum Number of Tries').
&meta_package_write('part').
&meta_stores_write('solved','string',
'Problem Status').
@@ -240,10 +267,12 @@ sub mandatory_part_meta {
'Number of Attempts').
&meta_stores_write('awarded','float',
'Partial Credit Factor');
-#
-# Note: responseid-specific data 'submission' and 'awarddetail'
-# not available to spreadsheet -> skip here
-#
+
+Note: responseid-specific data 'submission' and 'awarddetail'
+not available to spreadsheet -> skip here
+
+=cut
+
}
sub meta_part_order {
@@ -264,11 +293,14 @@ sub meta_response_order {
}
sub check_for_previous {
- my ($curresponse,$partid,$id) = @_;
+ my ($curresponse,$partid,$id,$last) = @_;
my %previous;
$previous{'used'} = 0;
foreach my $key (sort(keys(%Apache::lonhomework::history))) {
if ($key =~ /resource\.$partid\.$id\.submission$/) {
+ if ( $last && $key =~ /^(\d+):/ ) {
+ next if ($1 >= $last);
+ }
&Apache::lonxml::debug("Trying $key");
my $pastresponse=$Apache::lonhomework::history{$key};
if ($pastresponse eq $curresponse) {
@@ -306,7 +338,7 @@ sub handle_previous {
}
sub view_or_modify {
- my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
+ my ($symb,$courseid,$domain,$name) = &Apache::lonnet::whichuser();
my $myself=0;
if ( ($name eq $env{'user.name'}) && ($domain eq $env{'user.domain'}) ) {
$myself=1;
@@ -340,7 +372,7 @@ sub end_dataresponse {
if ( $target eq 'web' ) {
} elsif ($target eq 'grade' ) {
if ( defined $env{'form.submitted'}) {
- my ($symb,$courseid,$domain,$name)=&Apache::lonxml::whichuser();
+ my ($symb,$courseid,$domain,$name)=&Apache::lonnet::whichuser();
my $allowed=&Apache::lonnet::allowed('mgr',$courseid);
if ($allowed) {
&Apache::response::setup_params('dataresponse',$safeeval);
@@ -367,13 +399,14 @@ sub start_customresponse {
my $id = &Apache::response::start_response($parstack,$safeeval);
push(@Apache::lonxml::namespace,'customresponse');
my $result;
- undef($Apache::response::custom_answer);
+ @Apache::response::custom_answer=();
+ @Apache::response::custom_answer_type=();
&Apache::lonxml::register('Apache::response',('answer'));
if ($target eq 'web') {
if ( &Apache::response::show_answer() ) {
my $answer = &Apache::lonxml::get_param('answerdisplay',$parstack,
$safeeval);
- $Apache::inputtags::answertxt{$id}=$answer;
+ $Apache::inputtags::answertxt{$id}=[$answer];
}
} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_start($target,$token);
@@ -386,7 +419,6 @@ sub start_customresponse {
$safeeval,'answerdisplay');
if ($constructtag) {
$result = &Apache::edit::rebuild_tag($token);
- $result.=&Apache::edit::handle_insert();
}
} elsif ($target eq 'answer' || $target eq 'grade') {
&Apache::response::reset_params();
@@ -403,8 +435,11 @@ sub end_customresponse {
my $id=$Apache::inputtags::response[-1];
if ( $target eq 'grade' && &Apache::response::submitted() ) {
my $response = &Apache::response::getresponse();
- if ( $response =~ /[^\s]/ &&
- $Apache::response::custom_answer_type eq 'loncapa/perl') {
+ if ($Apache::lonhomework::type eq 'exam' ||
+ &Apache::response::submitted('scantron')) {
+ &Apache::response::scored_response($part,$id);
+ } elsif ( $response =~ /[^\s]/ &&
+ $Apache::response::custom_answer_type[-1] eq 'loncapa/perl') {
if (!$Apache::lonxml::default_homework_loaded) {
&Apache::lonxml::default_homework_load($safeeval);
}
@@ -416,7 +451,7 @@ sub end_customresponse {
${$safeeval->varglob('LONCAPA::customresponse_submission')}=
$response;
- my $award = &Apache::run::run('{ my $submission=$LONCAPA::customresponse_submission;'.$Apache::response::custom_answer.'}',$safeeval);
+ my $award = &Apache::run::run('{ my $submission=$LONCAPA::customresponse_submission;'.$Apache::response::custom_answer[-1].'}',$safeeval);
if (!&Apache::inputtags::valid_award($award)) {
$error = $award;
$award = 'ERROR';
@@ -429,25 +464,199 @@ sub end_customresponse {
$error;
}
}
+ } elsif ( $target eq 'answer') {
+ $result = &Apache::response::answer_header('customresponse');
+ my $answer = &Apache::lonxml::get_param('answerdisplay',$parstack,
+ $safeeval);
+ if ($env{'form.answer_output_mode'} ne 'tex') {
+ $answer = '<b>'.$answer.'</b>';
+ }
+ $result .= &Apache::response::answer_part('customresponse',$answer);
+ $result .= &Apache::response::answer_footer('customresponse');
+ }
+ if ($target eq 'web') {
+ &setup_prior_tries_hash(\&format_prior_response_math);
+ }
+ if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
+ $target eq 'tex' || $target eq 'analyze') {
+ &Apache::lonxml::increment_counter(&Apache::response::repetition(),
+ "$part.$id");
+ if ($target eq 'analyze') {
+ $Apache::lonhomework::analyze{"$part.$id.type"} = 'customresponse';
+ &Apache::lonhomework::set_bubble_lines();
+ }
}
pop(@Apache::lonxml::namespace);
+ pop(@Apache::response::custom_answer);
+ pop(@Apache::response::custom_answer_type);
&Apache::lonxml::deregister('Apache::response',('answer'));
&Apache::response::end_response();
return $result;
}
+sub format_prior_response_custom {
+ my ($mode,$answer) =@_;
+ return '<span class="LC_prior_custom">'.
+ &HTML::Entities::encode($answer,'"<>&').'</span>';
+}
+
+sub start_mathresponse {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+ my $id = &Apache::response::start_response($parstack,$safeeval);
+ push(@Apache::lonxml::namespace,'mathresponse');
+ my $result;
+ @Apache::response::custom_answer=();
+ @Apache::response::custom_answer_type=();
+ &Apache::lonxml::register('Apache::response',('answer'));
+ if ($target eq 'web') {
+ if ( &Apache::response::show_answer() ) {
+ my $answer = &Apache::lonxml::get_param('answerdisplay',$parstack,
+ $safeeval);
+ $Apache::inputtags::answertxt{$id}=[$answer];
+ }
+
+ } elsif ($target eq 'edit') {
+ $result.=&Apache::edit::tag_start($target,$token);
+ $result.=&Apache::edit::text_arg('String to display for answer:',
+ 'answerdisplay',$token);
+ $result.=&Apache::edit::select_arg('Algebra System:',
+ 'cas',
+ ['maxima'],
+ $token);
+ $result.=&Apache::edit::text_arg('Argument Array:',
+ 'args',$token).
+ &Apache::loncommon::help_open_topic('Maxima_Argument_Array');
+ $result.=&Apache::edit::text_arg('Libraries:',
+ 'libraries',$token).
+ &Apache::loncommon::help_open_topic('Maxima_Libraries');
+ $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
+ } elsif ($target eq 'modified') {
+ my $constructtag;
+ $constructtag=&Apache::edit::get_new_args($token,$parstack,
+ $safeeval,'answerdisplay','cas','args','libraries');
+ if ($constructtag) {
+ $result = &Apache::edit::rebuild_tag($token);
+ }
+ } elsif ($target eq 'answer' || $target eq 'grade') {
+ &Apache::response::reset_params();
+ } elsif ($target eq 'meta') {
+ $result .= &Apache::response::meta_package_write('mathresponse');
+ }
+ return $result;
+}
+
+sub edit_mathresponse_button {
+ my ($id,$field)=@_;
+ my $button=&mt('Edit Answer');
+# my $helplink=&Apache::loncommon::help_open_topic('Formula_Editor');
+ my $iconpath=$Apache::lonnet::perlvar{'lonIconsURL'};
+ return(<<ENDFORMULABUTTON);
+<script language="JavaScript">
+function edit_${id}_${field} (textarea) {
+ thenumber = textarea;
+ thedata = document.forms['lonhomework'].elements[textarea].value;
+ newwin = window.open("/adm/dragmath/applet/MaximaPopup.html","","width=565,height=400,resizable");
+}
+</script>
+<a href="javascript:edit_${id}_${field}('${field}');void(0);"><img class="stift" src='$iconpath/stift.gif' alt='$button' title='$button'/></a>
+ENDFORMULABUTTON
+}
+
+sub end_mathresponse {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+ my $result;
+ my $part=$Apache::inputtags::part;
+ my $id=$Apache::inputtags::response[-1];
+ if ( $target eq 'grade' && &Apache::response::submitted() ) {
+ my $response = &Apache::response::getresponse();
+ if ( $response =~ /[^\s]/ ) {
+ if (!$Apache::lonxml::default_homework_loaded) {
+ &Apache::lonxml::default_homework_load($safeeval);
+ }
+ my %previous = &Apache::response::check_for_previous($response,
+ $part,$id);
+ $Apache::lonhomework::results{"resource.$part.$id.submission"}=
+ $response;
+ my $error;
+ my $award;
+ my $cas = &Apache::lonxml::get_param('cas',$parstack,$safeeval);
+ if ($cas eq 'maxima') {
+ my $args = [&Apache::lonxml::get_param_var('args',$parstack,$safeeval)];
+ $award=&Apache::lonmaxima::maxima_run($Apache::response::custom_answer[-1],$response,$args,
+ &Apache::lonxml::get_param('libraries',$parstack,$safeeval));
+ }
+ if (!&Apache::inputtags::valid_award($award)) {
+ $error = $award;
+ $award = 'ERROR';
+ }
+ &Apache::response::handle_previous(\%previous,$award);
+ $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=
+ $award;
+ if ($error) {
+ $Apache::lonhomework::results{"resource.$part.$id.awardmsg"}=
+ $error;
+ }
+ }
+ }
+ if ($target eq 'web') {
+ &setup_prior_tries_hash(\&format_prior_response_math);
+ my $partid = $Apache::inputtags::part;
+ my $id = $Apache::inputtags::response[-1];
+ if (($Apache::inputtags::status['-1'] eq 'CAN_ANSWER')
+ && (&Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffeditor') ne 'yes')) {
+ $result.=&edit_mathresponse_button($id,"HWVAL_$id");
+ }
+ }
+
+ pop(@Apache::lonxml::namespace);
+ pop(@Apache::response::custom_answer);
+ pop(@Apache::response::custom_answer_type);
+ &Apache::lonxml::deregister('Apache::response',('answer'));
+ &Apache::response::end_response();
+ return $result;
+}
+
+sub format_prior_response_math {
+ my ($mode,$answer) =@_;
+ return '<span class="LC_prior_math">'.
+ &HTML::Entities::encode($answer,'"<>&').'</span>';
+}
+
+sub implicit_multiplication {
+ my ($expression)=@_;
+# Escape scientific notation, so 3e8 does not become 3*e*8
+# 3e8 -> 3&8; 3e-8 -> 3&-8; 3E+8 -> e&+8
+ $expression=~s/(\d+)e([\+\-]*\d+)/$1\&\($2\)/gsi;
+# 3x10^8 -> 3&8; 3*10^-8 -> 3&-8
+ $expression=~s/(\d+)(?:x|\*)10(?:\^|\*\*)([\+\-]*\d+)/$1\&\($2\)/gsi;
+# Fill in multiplication signs
+# a b -> a*b;3 b -> 3*b;3 4 -> 3*4
+ $expression=~s/([A-Za-z0-9])\s+(?=[A-Za-z0-9])/$1\*/gs;
+# )( -> )*(; ) ( -> )*(
+ $expression=~s/\)\s*\(/\)\*\(/gs;
+# 3a -> 3*a; 3( -> 3*(; 3 ( -> 3*(; 3A -> 3*A
+ $expression=~s/(\d)\s*([a-zA-Z\(])/$1\*$2/gs;
+# a ( -> a*(
+ $expression=~s/([A-Za-z0-9])\s+\(/$1\*\(/gs;
+# )a -> )*a; )3 -> )*3; ) 3 -> )*3
+ $expression=~s/\)\s*([A-Za-z0-9])/\)\*$1/gs;
+# 3&8 -> 3e8; 3&-4 -> 3e-4
+ $expression=~s/(\d+)\&\(([\+\-]*\d+)\)/$1e$2/gs;
+ return $expression;
+}
+
sub start_answer {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result;
- $Apache::response::custom_answer=
- &Apache::lonxml::get_all_text_unbalanced("/answer",$parser);
- $Apache::response::custom_answer_type=
- lc(&Apache::lonxml::get_param('type',$parstack,$safeeval));
- $Apache::response::custom_answer_type =~ s/\s+//g;
+ push(@Apache::response::custom_answer,
+ &Apache::lonxml::get_all_text_unbalanced("/answer",$parser));
+ push(@Apache::response::custom_answer_type,
+ lc(&Apache::lonxml::get_param('type',$parstack,$safeeval)));
+ $Apache::response::custom_answer_type[-1] =~ s/\s+//g;
if ($target eq "edit" ) {
$result=&Apache::edit::tag_start($target,$token,'Answer algorithm');
$result.=&Apache::edit::editfield($token->[1],
- $Apache::response::custom_answer,
+ $Apache::response::custom_answer[-1],
'',80,4);
} elsif ( $target eq "modified" ) {
$result=$token->[4].&Apache::edit::modifiedfield('/answer',$parser);
@@ -499,7 +708,7 @@ sub start_responseparam {
}
}
if (defined($optionlist)) {
- $result.='Use template: <select name="'.
+ $result.=&mt('Use template:').' <select name="'.
&Apache::edit::html_element_name('parameter_package').'">'.
'<option value=""></option>'.$optionlist.'</select><br />';
}
@@ -524,11 +733,11 @@ sub start_responseparam {
$Apache::lonnet::packagetab{"$tag&$name&display"};
$token->[2]->{'default'}=
$Apache::lonnet::packagetab{"$tag&$name&default"};
+ $token->[3] = ['name','type','description','default'];
$constructtag=1;
}
if ($constructtag) {
$result = &Apache::edit::rebuild_tag($token);
- $result.=&Apache::edit::handle_insert();
}
} elsif ($target eq 'grade' || $target eq 'answer' || $target eq 'web' ||
$target eq 'tex' || $target eq 'analyze' ) {
@@ -566,7 +775,7 @@ sub setup_params {
if ($env{'request.state'} eq 'construct') { return; }
my %paramlist=();
foreach my $key (keys(%Apache::lonnet::packagetab)) {
- if ($key =~ /^$tag/) {
+ if ($key =~ /^\Q$tag\E/) {
my ($package,$name) = split(/&/,$key);
$paramlist{$name}=1;
}
@@ -594,9 +803,10 @@ sub setup_params {
{
my @answer_bits;
+ my $need_row_start;
sub answer_header {
- my ($type,$increment) = @_;
+ my ($type,$increment,$rows) = @_;
my $result;
if ($env{'form.answer_output_mode'} eq 'tex') {
undef(@answer_bits);
@@ -609,34 +819,62 @@ sub answer_header {
}
push(@answer_bits,$bit);
} else {
+ my $td = '<td '.(defined($rows)?'rowspan="'.$rows.'"':'').'>';
$result = '<table border="1"><tr>';
if ($Apache::lonhomework::type eq 'exam') {
- $result .= '<td>'.$Apache::lonxml::counter. ')</td>';
+ $result .= $td.($Apache::lonxml::counter+$increment). ')</td>';
} else {
- $result .= '<td>Answer for Part:'.$Apache::inputtags::part.'</td>';
+ $result .= $td.&mt('Answer for Part: [_1]',
+ $Apache::inputtags::part).'</td>';
}
$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 .= "</tr>";
+ $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 = '<td>'.$answer.'</td>';
+ if ($need_row_start) {
+ $result .= '<tr>';
+ $need_row_start = 0;
+ }
+ $result .= '<td>'.$answer.'</td>';
}
return $result;
}
@@ -645,12 +883,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 = '</tr></table>';
+ if (!$need_row_start) {
+ $result .= '</tr>';
+ }
+ $result .= '</table>';
}
return $result;
}
@@ -659,7 +902,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) ) {
@@ -670,14 +913,44 @@ sub showallfoils {
return 0;
}
+=pod
+
+=item &getresponse($offset,$resulttype);
+
+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,
@@ -686,8 +959,17 @@ 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;
+ for ($line = 0; $line < $lines; $line++) {
+ my $theline = $Apache::lonxml::counter+$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;
@@ -697,13 +979,35 @@ sub getresponse {
} else {
$response = $let_to_num{$response};
}
+ if ($response ne "") {
+ $response += $line * $bubbles_per_line;
+ }
+ } else {
+ if ($response ne "") {
+ $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();
+
+Returns the number of lines that are required to encode the weight.
+(Currently expects that there are 10 bubbles per line)
+
+=cut
+
sub repetition {
my $id = $Apache::inputtags::part;
my $weight = &Apache::lonnet::EXT("resource.$id.weight");
@@ -713,6 +1017,30 @@ sub repetition {
return $repetition;
}
+=pod
+
+=item &scored_response($part_id,$response_id);
+
+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();
@@ -787,7 +1115,7 @@ sub show_answer {
my $award = $Apache::lonhomework::history{"resource.$part.solved"};
my $status = $Apache::inputtags::status[-1];
return ( ($award =~ /^correct/
- && lc($Apache::lonhomework::problemstatus) ne 'no')
+ && &Apache::lonhomework::show_problem_status())
|| $status eq "SHOW_ANSWER");
}
@@ -849,6 +1177,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;
@@ -873,15 +1214,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'
@@ -903,17 +1250,24 @@ 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 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
+
+=cut
+
sub check_status {
my ($id)=@_;
- if (!$id) { $id=$Apache::linputtags::part; }
+ 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");
@@ -933,6 +1287,53 @@ sub check_status {
return 2;
}
+=pod
+
+=item setup_prior_tries_hash($func,$data)
+
+ 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
+
+=cut
+
+sub setup_prior_tries_hash {
+ my ($func,$data) = @_;
+ my $part = $Apache::inputtags::part;
+ my $id = $Apache::inputtags::response[-1];
+ foreach my $i (1..$Apache::lonhomework::history{'version'}) {
+ my $sub_key = "$i:resource.$part.$id.submission";
+ next if (!exists($Apache::lonhomework::history{$sub_key}));
+ my @other_data;
+ 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});
+ }
+ }
+
+ my $output =
+ &$func('grade',
+ $Apache::lonhomework::history{$sub_key},
+ \@other_data);
+ if (defined($output)) {
+ $Apache::inputtags::submission_display{$sub_key} = $output;
+ }
+ }
+}
+
1;
__END__
+=pod
+
+=back
+
+=cut
\ No newline at end of file