--- loncom/homework/response.pm 2007/09/27 19:05:03 1.178 +++ 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.178 2007/09/27 19:05:03 albertel Exp $ +# $Id: response.pm,v 1.208 2008/11/25 13:16:17 jms Exp $ # # Copyright Michigan State University Board of Trustees # @@ -26,6 +26,29 @@ # 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; @@ -217,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'). @@ -241,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 { @@ -451,7 +479,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 +514,7 @@ sub start_mathresponse { $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:', @@ -490,12 +524,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 +545,23 @@ 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"); +} + +$button +ENDFORMULABUTTON +} + sub end_mathresponse { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result; @@ -527,7 +582,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; @@ -544,6 +600,12 @@ 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); @@ -646,7 +708,7 @@ sub start_responseparam { } } if (defined($optionlist)) { - $result.='Use template:
'; } @@ -671,6 +733,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) { @@ -795,9 +858,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); @@ -816,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 = ''; + if (!$need_row_start) { + $result .= ''; + } + $result .= ''; } return $result; } @@ -880,7 +952,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, @@ -891,10 +962,9 @@ 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; } @@ -903,7 +973,6 @@ sub getresponse { # 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; @@ -1046,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"); } @@ -1107,17 +1176,20 @@ sub pick_foil_for_concept { $Apache::response::conceptgroup{'names'}; } -#------------------------------------------------------------ -# -# 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. -# -# -# + +=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; @@ -1151,7 +1223,7 @@ sub submitted { } # 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; } @@ -1178,14 +1250,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; } @@ -1253,3 +1332,8 @@ sub setup_prior_tries_hash { 1; __END__ +=pod + +=back + +=cut \ No newline at end of file