Molecule Editor

--- loncom/homework/chemresponse.pm 2005/01/21 22:10:59 1.44 +++ loncom/homework/chemresponse.pm 2006/03/09 00:48:47 1.63 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # chemical equation style response # -# $Id: chemresponse.pm,v 1.44 2005/01/21 22:10:59 albertel Exp $ +# $Id: chemresponse.pm,v 1.63 2006/03/09 00:48:47 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -30,9 +30,10 @@ package Apache::chemresponse; use strict; use Apache::lonxml; use Apache::lonnet; +use Apache::lonlocal; BEGIN { - &Apache::lonxml::register('Apache::chemresponse',('organicresponse','organicstructure','reactionresponse')); + &Apache::lonxml::register('Apache::chemresponse',('organicresponse','organicstructure','reactionresponse','chem')); } sub chem_standard_order { @@ -63,7 +64,7 @@ sub chem_standard_order { } sub separate_jme_window { - my ($smile_input,$jme_input,$molecule,$options)=@_; + my ($smile_input,$jme_input,$molecule,$options,$shown_text)=@_; my $smilesection; if (defined($smile_input)) { $smilesection=<'; } + my $insert_answer; + if ($shown_text eq '') { + $insert_answer= + ''; + } + my $body=< Molecule Editor - - + @@ -121,13 +151,29 @@ $molecule CHEMPAGE $body=&HTML::Entities::encode($body,'<>&"'); $body=~s/\n/ /g; + my $nothing=&Apache::lonhtmlcommon::javascript_nothing(); my $docopen=&Apache::lonhtmlcommon::javascript_docopen(); + my $display=&mt('Draw Molecule'); + if (defined($shown_text)) { $display=&mt($shown_text); } my $result=< + CHEMINPUT return $result; } +sub jme_img { + my ($jme,$smile,$width,$options)=@_; + my $id=&Apache::loncommon::get_cgi_id(); + my $result=' '.$smile.'

'.$smile.'

+ &Apache::lonnet::escape($jme), + 'cgi.'.$id.'.PNG' => 1, + 'cgi.'.$id.'.WIDTH' => $width); + return $result; +} + sub start_organicresponse { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result; @@ -136,21 +182,16 @@ sub start_organicresponse { if ($target eq 'meta') { $result=&Apache::response::meta_package_write('organicresponse'); } elsif ($target eq 'web') { - if ( &Apache::response::show_answer() ) { - my $jmeanswer=&Apache::lonxml::get_param('jmeanswer',$parstack, - $safeeval); + my $jmeanswer=&Apache::lonxml::get_param('jmeanswer',$parstack, + $safeeval); + if ( &Apache::response::show_answer() && $jmeanswer ne '') { my $options=&Apache::lonxml::get_param('options',$parstack, $safeeval); my $width=&Apache::lonxml::get_param('width',$parstack, $safeeval); - my $id=&Apache::loncommon::get_cgi_id(); - $result="

- &Apache::lonnet::escape($jmeanswer), - 'cgi.'.$id.'.PNG' => 1, - 'cgi.'.$id.'.WIDTH' => $width); + my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack, + $safeeval); + $result.=&jme_img($jmeanswer,$answers[0],$width,$options); } else { my $molecule; if (defined($Apache::lonhomework::history{"resource.$partid.$id.molecule"})) { @@ -161,7 +202,12 @@ sub start_organicresponse { } my $options=&Apache::lonxml::get_param('options',$parstack, $safeeval); - $result=&separate_jme_window("HWVAL_$id","MOLECULE_$id",$molecule,$options); + my $shown_text; + if (&Apache::response::show_answer()) { + $shown_text="Show Your Last Answer"; + } + $result=&separate_jme_window("HWVAL_$id","MOLECULE_$id",$molecule, + $options,$shown_text); $result.= ''; } } elsif ($target eq 'edit') { @@ -205,13 +251,14 @@ sub start_organicresponse { 'options','width'); if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } } + return $result; } sub end_organicresponse { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result; - if ($target eq 'grade' && defined($ENV{'form.submitted'})) { + if ($target eq 'grade' && &Apache::response::submitted()) { &Apache::response::setup_params($$tagstack[-1],$safeeval); my $response = &Apache::response::getresponse(); if ( $response =~ /[^\s]/) { @@ -235,7 +282,7 @@ sub end_organicresponse { } &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"}; + $Apache::lonhomework::results{"resource.$partid.$id.molecule"}=$env{"form.MOLECULE_$id"}; } } elsif ($target eq "edit") { $result.= &Apache::edit::tag_end($target,$token,''); @@ -248,7 +295,12 @@ sub end_organicresponse { } $result.=&Apache::response::answer_footer('organicresponse'); } - &Apache::response::end_response; + + if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || + $target eq 'tex' || $target eq 'analyze') { + &Apache::lonxml::increment_counter(&Apache::response::repetition()); + } + &Apache::response::end_response(); return $result; } @@ -269,10 +321,14 @@ sub start_organicstructure { 'cgi.'.$id.'.WIDTH' => $width ); } elsif ($target eq 'tex') { my $texwidth=&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,undef,1); + my $webwidth=&Apache::lonxml::get_param('width', $parstack, $safeeval); + my $webheight=&Apache::lonxml::get_param('height', $parstack, $safeeval); + if (!$webheight) { $webheight = $webwidth; } if (!$texwidth) { $texwidth='90'; } + $result = "%DYNAMICIMAGE:$webwidth:$webheight:$texwidth\n"; my $molecule=&Apache::lonxml::get_param('molecule',$parstack,$safeeval); my $options=&Apache::lonxml::get_param('options',$parstack,$safeeval); - my $filename = $ENV{'user.name'}.'_'.$ENV{'user.domain'}. + my $filename = $env{'user.name'}.'_'.$env{'user.domain'}. '_'.time.'_'.$$.int(rand(1000)).'_organicstructure'; my $id=$filename; &Apache::lonnet::appenv( @@ -334,13 +390,15 @@ sub edit_reaction_button { my $docopen=&Apache::lonhtmlcommon::javascript_docopen(); my $result=< +// - + EDITREACTION return $result; } @@ -362,8 +420,11 @@ sub start_reactionresponse { } 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); + if (!$Apache::lonxml::default_homework_loaded) { + &Apache::lonxml::default_homework_load($safeeval); + } + @Apache::scripttag::parser_env = @_; + $Apache::inputtags::answertxt{$id}=&Apache::run::run("return &chemparse(q\0$ans\0);",$safeeval); } } elsif ($target eq "edit") { $result .=&Apache::edit::tag_start($target,$token); @@ -390,7 +451,7 @@ sub start_reactionresponse { sub end_reactionresponse { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result; - if ($target eq 'grade' && defined($ENV{'form.submitted'})) { + if ($target eq 'grade' && &Apache::response::submitted()) { &Apache::response::setup_params($$tagstack[-1],$safeeval); my $response = &Apache::response::getresponse(); if ( $response =~ /[^\s]/) { @@ -427,7 +488,33 @@ sub end_reactionresponse { } $result.=&Apache::response::answer_footer('reactionresponse'); } - &Apache::response::end_response; + + if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || + $target eq 'tex' || $target eq 'analyze') { + &Apache::lonxml::increment_counter(&Apache::response::repetition()); + } + &Apache::response::end_response(); + return $result; +} + +sub start_chem { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_; + my $result = ''; + my $inside = &Apache::lonxml::get_all_text_unbalanced("/chem",$parser); + if ($target eq 'tex' || $target eq 'web') { + $inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]); + if (!$Apache::lonxml::default_homework_loaded) { + &Apache::lonxml::default_homework_load($safeeval); + } + @Apache::scripttag::parser_env = @_; + $result=&Apache::run::run("return &chemparse(q\0$inside\0);",$safeeval); + } + return $result; +} + +sub end_chem { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_; + my $result = ''; return $result; }