Molecule Editor

--- loncom/homework/chemresponse.pm 2005/05/25 21:45:07 1.53 +++ loncom/homework/chemresponse.pm 2006/05/30 12:45:36 1.66 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # chemical equation style response # -# $Id: chemresponse.pm,v 1.53 2005/05/25 21:45:07 albertel Exp $ +# $Id: chemresponse.pm,v 1.66 2006/05/30 12:45:36 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -30,6 +30,10 @@ package Apache::chemresponse; use strict; use Apache::lonxml; use Apache::lonnet; +use Apache::lonlocal; +use lib '/home/httpd/lib/perl/'; +use LONCAPA; + BEGIN { &Apache::lonxml::register('Apache::chemresponse',('organicresponse','organicstructure','reactionresponse','chem')); @@ -63,7 +67,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 $body=< - -Molecule Editor + my $insert_answer; + if ($shown_text eq '') { + $insert_answer= + ''; + } + + my $js = < function submitSmiles() { jmeFile = document.applets.JME.jmeFile(); @@ -98,37 +105,84 @@ function submitSmiles() { function openHelpWindow() { window.open("/adm/jme/jme_help.html","","scrollbars=yes,resizable=yes,width=500,height=600"); } +function substituent(r) {document.applets.JME.setSubstituent(r);} - - +CHEMJS + + my $start_page = + &Apache::loncommon::start_page('Molecule Editor',$js, + {'only_body' => 1, + 'bgcolor' => '#FFFFFF',}); + my $end_page = + &Apache::loncommon::end_page(); + + my $body=< - + - - +$end_page 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.'

+ &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; @@ -137,21 +191,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"})) { @@ -162,7 +211,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') { @@ -206,18 +260,30 @@ 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' && &Apache::response::submitted()) { + + my $partid = $Apache::inputtags::part; + my $id = $Apache::inputtags::response['-1']; + + if ($target eq 'grade' + && &Apache::response::submitted() + && $Apache::lonhomework::type eq 'exam') { + + &Apache::response::scored_response($partid,$id); + + } elsif ($target eq 'grade' + && &Apache::response::submitted() + && $Apache::lonhomework::type ne 'exam') { + &Apache::response::setup_params($$tagstack[-1],$safeeval); my $response = &Apache::response::getresponse(); if ( $response =~ /[^\s]/) { - my $partid = $Apache::inputtags::part; - my $id = $Apache::inputtags::response['-1']; my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval); my %previous = &Apache::response::check_for_previous($response,$partid,$id); $Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response; @@ -249,7 +315,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; } @@ -265,22 +336,26 @@ sub start_organicstructure { if ($options =~ /border/) { $result.= ' border="1"'; } $result.=' />'; &Apache::lonnet::appenv( - 'cgi.'.$id.'.JME' => &Apache::lonnet::escape($molecule), + 'cgi.'.$id.'.JME' => &escape($molecule), 'cgi.'.$id.'.PNG' => 1, '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'}. '_'.time.'_'.$$.int(rand(1000)).'_organicstructure'; my $id=$filename; &Apache::lonnet::appenv( - 'cgi.'.$id.'.JME' => &Apache::lonnet::escape($molecule), + 'cgi.'.$id.'.JME' => &escape($molecule), 'cgi.'.$id.'.PS' => 1, 'cgi.'.$id.'.WIDTH' => $texwidth ); - $id=&Apache::lonnet::escape($id); + $id=&escape($id); &Apache::lonxml::register_ssi("/cgi-bin/convertjme.pl?$id"); if ($options =~ /border/) { $result.= '\fbox{'; } $result .= '\graphicspath{{/home/httpd/perl/tmp/}}\includegraphics[width='.$texwidth.' mm]{'.$filename.'.eps}'; @@ -329,17 +404,27 @@ sub end_organicstructure { sub edit_reaction_button { my ($id,$field,$reaction)=@_; - my $id_es=&Apache::lonnet::escape($id); - my $field_es=&Apache::lonnet::escape($field); - my $reaction_es=&Apache::lonnet::escape($reaction); + my $id_es=&escape($id); + my $field_es=&escape($field); + my $reaction_es=&escape($reaction); my $docopen=&Apache::lonhtmlcommon::javascript_docopen(); + my $start_page = + &Apache::loncommon::start_page('LON-CAPA Reaction Editor',undef, + {'frameset' => 1, + 'js_ready' => 1, + 'add_entries' => { + 'rows' => "30%", + 'border' => "0",}},); + my $end_page = + &Apache::loncommon::end_page({'frameset' => 1, + 'js_ready' => 1}); my $result=< // @@ -396,12 +481,23 @@ sub start_reactionresponse { sub end_reactionresponse { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result; - if ($target eq 'grade' && &Apache::response::submitted()) { + + my $partid = $Apache::inputtags::part; + my $id = $Apache::inputtags::response['-1']; + + if ($target eq 'grade' + && &Apache::response::submitted() + && $Apache::lonhomework::type eq 'exam') { + + &Apache::response::scored_response($partid,$id); + + } elsif ($target eq 'grade' + && &Apache::response::submitted() + && $Apache::lonhomework::type ne 'exam') { + &Apache::response::setup_params($$tagstack[-1],$safeeval); my $response = &Apache::response::getresponse(); if ( $response =~ /[^\s]/) { - my $partid = $Apache::inputtags::part; - my $id = $Apache::inputtags::response['-1']; my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval); my %previous = &Apache::response::check_for_previous($response,$partid,$id); $Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response; @@ -433,7 +529,12 @@ 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; }