';
+ $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,7 +1133,7 @@ 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'} };
@@ -878,9 +1187,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 {
@@ -941,6 +1256,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 +1293,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,14 +1329,21 @@ 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 (!defined($id)) { $id=$Apache::inputtags::part; }
@@ -1025,6 +1366,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
+ENDFORMULABUTTON
+}
+
sub end_mathresponse {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result;
@@ -494,8 +588,7 @@ sub end_mathresponse {
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 ( $response =~ /[^\s]/ ) {
if (!$Apache::lonxml::default_homework_loaded) {
&Apache::lonxml::default_homework_load($safeeval);
}
@@ -504,10 +597,19 @@ sub end_mathresponse {
$Apache::lonhomework::results{"resource.$part.$id.submission"}=
$response;
my $error;
- ${$safeeval->varglob('LONCAPA::mathresponse_submission')}=
- $response;
-
- my $award = &Apache::run::run('{ my $submission=$LONCAPA::mathresponse_submission;'.$Apache::response::custom_answer.'}',$safeeval);
+ 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 ($cas eq 'R') {
+ my $args = [&Apache::lonxml::get_param_var('args',$parstack,$safeeval)];
+ $award=&Apache::lonr::r_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';
@@ -521,25 +623,65 @@ sub end_mathresponse {
}
}
}
+ 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 ''.
+ &HTML::Entities::encode($answer,'"<>&').'';
+}
+
+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);
@@ -591,7 +733,7 @@ sub start_responseparam {
}
}
if (defined($optionlist)) {
- $result.='Use template: