--- loncom/homework/response.pm 2007/08/10 18:16:28 1.174 +++ loncom/homework/response.pm 2008/09/04 20:31:55 1.197 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # various response type definitons response definition # -# $Id: response.pm,v 1.174 2007/08/10 18:16:28 riegler Exp $ +# $Id: response.pm,v 1.197 2008/09/04 20:31:55 riegler Exp $ # # Copyright Michigan State University Board of Trustees # @@ -451,7 +451,12 @@ sub end_customresponse { } if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex' || $target eq 'analyze') { - &Apache::lonxml::increment_counter(&Apache::response::repetition()); + &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); @@ -481,6 +486,10 @@ sub start_mathresponse { $safeeval); $Apache::inputtags::answertxt{$id}=[$answer]; } + if ($Apache::inputtags::status['-1'] eq 'CAN_ANSWER') { + $result.=&edit_mathresponse_button($id,"HWVAL_$id"); + } + } elsif ($target eq 'edit') { $result.=&Apache::edit::tag_start($target,$token); $result.=&Apache::edit::text_arg('String to display for answer:', @@ -490,12 +499,16 @@ sub start_mathresponse { ['maxima'], $token); $result.=&Apache::edit::text_arg('Argument Array:', - 'args',$token); + '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'); + $safeeval,'answerdisplay','cas','args','libraries'); if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } @@ -507,6 +520,24 @@ sub start_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(< +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"); +} + + +$helplink +ENDFORMULABUTTON +} + sub end_mathresponse { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result; @@ -527,7 +558,8 @@ sub end_mathresponse { 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); + $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; @@ -569,8 +601,7 @@ sub implicit_multiplication { $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 -# The while-pos-construction is necessary for a b c -> a*b*c*d instead of a*b c*d - while($expression=~s/([A-Za-z0-9])\s+([A-Za-z0-9])/$1\*$2/gs){pos($expression)--} + $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 @@ -672,6 +703,7 @@ 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) { @@ -796,9 +828,13 @@ sub answer_part { last; } } - if ($answer ne '') { - $answer = '\verb'.$to_use.$answer.$to_use; - } + 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,$answer); @@ -817,12 +853,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; } @@ -881,7 +922,6 @@ sub getresponse { 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, 'P'=>15,'Q'=>16,'R'=>17,'S'=>18,'T'=>19,'U'=>20,'V'=>21, @@ -892,14 +932,17 @@ sub getresponse { my $line; for ($line = 0; $line < $lines; $line++) { - $response = $env{'scantron.'. - ($Apache::lonxml::counter+$offset-1+$line). - '.answer'}; - if ($response ne "") { + 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; if ($resulttype ne 'letter') { if ($resulttype eq 'A is 1') { $response = $let_to_num{$response}+1; @@ -914,9 +957,6 @@ sub getresponse { $response = chr(ord($response) + $line * $bubbles_per_line); } } - # save submitted response for later - $Apache::lonhomework::results{"resource.$part.$id.scantron"}.= - $response; } else { $response = $env{$formparm}; @@ -1045,7 +1085,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"); } @@ -1207,6 +1247,21 @@ 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; 500 Internal Server Error

Internal Server Error

The server encountered an internal error or misconfiguration and was unable to complete your request.

Please contact the server administrator at root@localhost to inform them of the time this error occurred, and the actions you performed just before this error.

More information about this error may be available in the server error log.