LON-CAPA Reaction Editor

--- loncom/homework/chemresponse.pm 2003/10/21 20:49:06 1.21 +++ loncom/homework/chemresponse.pm 2004/09/28 20:32:00 1.40 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # chemical equation style response # -# $Id: chemresponse.pm,v 1.21 2003/10/21 20:49:06 albertel Exp $ +# $Id: chemresponse.pm,v 1.40 2004/09/28 20:32:00 www 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,7 +119,7 @@ $molecule CHEMPAGE - $body=&HTML::Entities::encode($body); + $body=&HTML::Entities::encode($body,'<>&"'); $body=~s/\n/ /g; my $result=< @@ -106,6 +133,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 +144,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 +156,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 +165,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 +192,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; @@ -208,7 +236,7 @@ sub start_organicstructure { my $width=&Apache::lonxml::get_param('width',$parstack,$safeeval); my $molecule=&Apache::lonxml::get_param('molecule',$parstack,$safeeval); my $options=&Apache::lonxml::get_param('options',$parstack,$safeeval); - my $id=time.'_'.int(rand(1000)); + my $id=&Apache::loncommon::get_cgi_id(); $result="

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); @@ -235,9 +263,8 @@ sub start_organicstructure { if ($options =~ /border/) { $result.= '} '; } } elsif ($target eq 'edit') { $result .=&Apache::edit::tag_start($target,$token); - $result .=&Apache::edit::text_arg('Width:','width',$token,5); - $result .=&Apache::edit::text_arg('Height:','height',$token,5); - $result .=&Apache::edit::text_arg('TeXwidth:','texwidth',$token,5); + $result .=&Apache::edit::text_arg('Width (pixels):','width',$token,5); + $result .=&Apache::edit::text_arg('TeXwidth (mm):','texwidth',$token,5); $result .=''; $result .=&Apache::edit::text_arg('Molecule:','molecule',$token,40); my $molecule=&Apache::lonxml::get_param('molecule',$parstack, @@ -248,7 +275,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.="
"; @@ -256,12 +283,12 @@ sub start_organicstructure { [ ['reaction','Is a reaction'], ['border','Draw a border'] ], $token); - $result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); + $result .=&Apache::edit::end_row(); } elsif ($target eq 'modified') { my $constructtag=&Apache::edit::get_new_args($token,$parstack, $safeeval,'molecule', - 'width','height', - 'texwidth','options'); + 'width','texwidth', + 'options'); if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } } return $result; @@ -286,10 +313,10 @@ sub edit_reaction_button { 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.document.writeln(' LON-CAPA Reaction Editor '); } - + EDITREACTION return $result; } @@ -299,11 +326,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, @@ -311,11 +348,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; @@ -325,7 +367,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; @@ -336,7 +378,8 @@ 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';