LON-CAPA Reaction Editor

--- loncom/homework/chemresponse.pm 2003/12/08 18:48:12 1.26 +++ loncom/homework/chemresponse.pm 2004/10/21 06:37:36 1.42 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # chemical equation style response # -# $Id: chemresponse.pm,v 1.26 2003/12/08 18:48:12 albertel Exp $ +# $Id: chemresponse.pm,v 1.42 2004/10/21 06:37:36 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -35,7 +35,34 @@ BEGIN { &Apache::lonxml::register('Apache::chemresponse',('organicresponse','organicstructure','reactionresponse')); } -sub seperate_jme_window { +sub chem_standard_order { + my ($reaction) = @_; + my ($re,$pr) = split(/->|<=>/,$reaction); + my @reactants = split(/\s\+/,$re); + my @products = split(/\s\+/,$pr); + foreach my $substance (@reactants,@products) { + $substance =~ s/(\^\d*)\s+/$1_/g; # protect superscript space + $substance =~ s/\s*//g; # strip whitespace + $substance =~ s/_/ /g; # restore superscript space + } + @reactants = sort @reactants; + @products = sort @products; + my $standard = ''; + foreach my $substance (@reactants) { + $standard .= $substance; + $standard .= ' + '; + } + $standard =~ s/ \+ $//; # get rid of trailing plus sign + $standard .= ' -> '; + foreach my $substance (@products) { + $standard .= $substance; + $standard .= ' + '; + } + $standard =~ s/ \+ $//; # get rid of trailing plus sign + return $standard; +} + +sub separate_jme_window { my ($smile_input,$jme_input,$molecule,$options)=@_; my $smilesection; if (defined($smile_input)) { @@ -75,7 +102,7 @@ function openHelpWindow() { - + You have to enable Java and JavaScript on your machine. $molecule @@ -92,10 +119,11 @@ $molecule CHEMPAGE - $body=&HTML::Entities::encode($body); + $body=&HTML::Entities::encode($body,'<>&"'); $body=~s/\n/ /g; + my $docopen=&Apache::lonhtmlcommon::javascript_docopen(); my $result=< + CHEMINPUT return $result; } @@ -106,6 +134,7 @@ sub start_organicresponse { my $partid = $Apache::inputtags::part; my $id = &Apache::response::start_response($parstack,$safeeval); if ($target eq 'meta') { + $result=&Apache::response::meta_package_write('organicresponse'); } elsif ($target eq 'web') { my $molecule; if (defined($Apache::lonhomework::history{"resource.$partid.$id.molecule"})) { @@ -116,7 +145,7 @@ sub start_organicresponse { } my $options=&Apache::lonxml::get_param('options',$parstack, $safeeval); - $result=&seperate_jme_window("HWVAL_$id","MOLECULE_$id",$molecule,$options); + $result=&separate_jme_window("HWVAL_$id","MOLECULE_$id",$molecule,$options); $result.= ''; } elsif ($target eq 'edit') { $result .=&Apache::edit::tag_start($target,$token); @@ -128,7 +157,7 @@ sub start_organicresponse { $token,40); my $molecule=&Apache::lonxml::get_param('molecule',$parstack, $safeeval); - $result .=&seperate_jme_window(undef, + $result .=&separate_jme_window(undef, &Apache::edit::html_element_name('molecule'), $molecule,$options); $result .='
'; @@ -137,13 +166,13 @@ sub start_organicresponse { $result .=&Apache::edit::hidden_arg('jmeanswer',$token); my $jmeanswer=&Apache::lonxml::get_param('jmeanswer',$parstack, $safeeval); - $result .=&seperate_jme_window( + $result .=&separate_jme_window( &Apache::edit::html_element_name('answer'), &Apache::edit::html_element_name('jmeanswer'), $jmeanswer,$options); $result .='
'; $result .=&Apache::edit::checked_arg('Options:','options', - [ ['autoez','Auto E,Z sterochemistry'], + [ ['autoez','Auto E,Z stereochemistry'], ['multipart','Multipart Structures'], ['nostereo','No stereochemistry'], ['reaction','Is a reaction'], @@ -164,7 +193,7 @@ sub end_organicresponse { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result; if ($target eq 'grade' && defined($ENV{'form.submitted'})) { - &Apache::response::setup_params($$tagstack[-1]); + &Apache::response::setup_params($$tagstack[-1],$safeeval); my $response = &Apache::response::getresponse(); if ( $response =~ /[^\s]/) { my $partid = $Apache::inputtags::part; @@ -182,6 +211,9 @@ sub end_organicresponse { $ad='INCORRECT'; } } + if ($ad && $Apache::lonhomework::type eq 'survey') { + $ad='SUBMITTED'; + } &Apache::response::handle_previous(\%previous,$ad); $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad; $Apache::lonhomework::results{"resource.$partid.$id.molecule"}=$ENV{"form.MOLECULE_$id"}; @@ -217,7 +249,7 @@ sub start_organicstructure { 'cgi.'.$id.'.PNG' => 1, 'cgi.'.$id.'.WIDTH' => $width ); } elsif ($target eq 'tex') { - my $texwidth=&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,1); + my $texwidth=&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,undef,1); if (!$texwidth) { $texwidth='90'; } my $molecule=&Apache::lonxml::get_param('molecule',$parstack,$safeeval); my $options=&Apache::lonxml::get_param('options',$parstack,$safeeval); @@ -247,7 +279,7 @@ sub start_organicstructure { $options.= ',multipart,number'; } - $result .=&seperate_jme_window(undef, + $result .=&separate_jme_window(undef, &Apache::edit::html_element_name('molecule'), $molecule,$options); $result.="
"; @@ -280,15 +312,16 @@ sub edit_reaction_button { my $id_es=&Apache::lonnet::escape($id); my $field_es=&Apache::lonnet::escape($field); my $reaction_es=&Apache::lonnet::escape($reaction); + my $docopen=&Apache::lonhtmlcommon::javascript_docopen(); my $result=< function create_reaction_window_${id}_${field} () { editor=window.open('','','width=500,height=270,scrollbars=no,resizable=yes'); - editor.document.open('text/html','replace'); - editor.document.writeln(' LON-CAPA Reaction Editor '); + editor.$docopen; + editor.document.writeln(' LON-CAPA Reaction Editor '); } - + EDITREACTION return $result; } @@ -298,11 +331,21 @@ sub start_reactionresponse { my $result; my $id = &Apache::response::start_response($parstack,$safeeval); if ($target eq 'meta') { + $result=&Apache::response::meta_package_write('reactionresponse'); } elsif ($target eq 'web') { my $partid = $Apache::inputtags::part; my $id = $Apache::inputtags::response['-1']; my $reaction=$Apache::lonhomework::history{"resource.$partid.$id.submission"}; - $result.=&edit_reaction_button($id,"HWVAL_$id",$reaction); + if ($reaction eq '') { $reaction=&Apache::lonxml::get_param('initial',$parstack,$safeeval); } + my $status=$Apache::inputtags::status['-1']; + if ($status eq 'CAN_ANSWER') { + $result.=&edit_reaction_button($id,"HWVAL_$id",$reaction); + } + if ( &Apache::response::show_answer() ) { + my $ans=&Apache::lonxml::get_param('answer',$parstack,$safeeval); + $ans=~s/(\\|\')/\\$1/g; + $Apache::inputtags::answertxt{$id}=&Apache::run::run("return &chemparse('$ans');",$safeeval); + } } elsif ($target eq "edit") { $result .=&Apache::edit::tag_start($target,$token); my $answer=&Apache::lonxml::get_param('answer',$parstack, @@ -310,11 +353,16 @@ sub start_reactionresponse { $result .=''. &Apache::edit::text_arg('Answer:','answer',$token,40); $result .=&edit_reaction_button($id,&Apache::edit::html_element_name('answer'),$answer).''; + my $initial=&Apache::lonxml::get_param('initial',$parstack,$safeeval); + $result.=''. + &Apache::edit::text_arg('Initial Reation:','initial',$token,40); + $result .=&edit_reaction_button($id,&Apache::edit::html_element_name('initial'),$initial).''; $result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); } elsif ($target eq 'modified') { my $constructtag=&Apache::edit::get_new_args($token,$parstack, - $safeeval,'answer'); + $safeeval,'answer', + 'initial'); if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } } return $result; @@ -324,7 +372,7 @@ sub end_reactionresponse { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result; if ($target eq 'grade' && defined($ENV{'form.submitted'})) { - &Apache::response::setup_params($$tagstack[-1]); + &Apache::response::setup_params($$tagstack[-1],$safeeval); my $response = &Apache::response::getresponse(); if ( $response =~ /[^\s]/) { my $partid = $Apache::inputtags::part; @@ -335,12 +383,16 @@ sub end_reactionresponse { my $ad; foreach my $answer (@answers) { &Apache::lonxml::debug("submitted a $response for $answer
\n"); - if ($response eq $answer) { + if (&chem_standard_order($response) eq + &chem_standard_order($answer)) { $ad='EXACT_ANS'; } else { $ad='INCORRECT'; } } + if ($ad && $Apache::lonhomework::type eq 'survey') { + $ad='SUBMITTED'; + } &Apache::response::handle_previous(\%previous,$ad); $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad; }