--- loncom/homework/chemresponse.pm 2005/06/30 18:56:35 1.60 +++ loncom/homework/chemresponse.pm 2011/07/04 09:24:54 1.89 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # chemical equation style response # -# $Id: chemresponse.pm,v 1.60 2005/06/30 18:56:35 albertel Exp $ +# $Id: chemresponse.pm,v 1.89 2011/07/04 09:24:54 foxr Exp $ # # Copyright Michigan State University Board of Trustees # @@ -31,6 +31,9 @@ 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')); @@ -87,10 +90,7 @@ JMESECTION ''; } - my $body=< - -Molecule Editor + my $js = < function submitSmiles() { jmeFile = document.applets.JME.jmeFile(); @@ -107,8 +107,18 @@ function openHelpWindow() { } function substituent(r) {document.applets.JME.setSubstituent(r);} - - +CHEMJS + + my $start_page = + &Apache::loncommon::start_page('Molecule Editor',undef, + {'only_body' => 1, + 'js_ready' => 1, + 'bgcolor' => '#FFFFFF',}); + my $end_page = + &Apache::loncommon::end_page({'js_ready' => 1,}); + my $java_not_enabled=&Apache::lonhtmlcommon::java_not_enabled(); + my $body=<
@@ -133,11 +143,12 @@ function substituent(r) {document.applet
-You have to enable Java and JavaScript on your machine. +$java_not_enabled $molecule
JME Editor courtesy of Peter Ertl, Novartis +
$insert_answer
@@ -145,31 +156,46 @@ $insert_answer
- - CHEMPAGE - $body=&HTML::Entities::encode($body,'<>&"'); - $body=~s/\n/ /g; + + $body=&Apache::loncommon::js_ready($body); 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 $iconpath=$Apache::lonnet::perlvar{'lonIconsURL'}; + my $function = + 'LONCAPA_draw_molecule_'.&Apache::lonhtmlcommon::get_uniq_name(); my $result=< + CHEMINPUT + if ($shown_text eq '') { + $result .=<$display +PENCIL + } else { + $result .= ''; + } return $result; } - sub jme_img { my ($jme,$smile,$width,$options)=@_; my $id=&Apache::loncommon::get_cgi_id(); my $result=''.$smile.' - &Apache::lonnet::escape($jme), - 'cgi.'.$id.'.PNG' => 1, - 'cgi.'.$id.'.WIDTH' => $width); + &Apache::lonnet::appenv({'cgi.'.$id.'.JME' => + &escape($jme), + 'cgi.'.$id.'.PNG' => 1, + 'cgi.'.$id.'.WIDTH' => $width}); return $result; } @@ -183,30 +209,19 @@ sub start_organicresponse { } elsif ($target eq 'web') { 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 (@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"})) { - $molecule=$Apache::lonhomework::history{"resource.$partid.$id.molecule"}; - } else { - $molecule=&Apache::lonxml::get_param('molecule',$parstack, + if (&Apache::response::show_answer()) { + my $jmeanswer=&Apache::lonxml::get_param('jmeanswer',$parstack, + $safeeval); + if ($jmeanswer ne '') { + my $options=&Apache::lonxml::get_param('options',$parstack, + $safeeval); + my $width=&Apache::lonxml::get_param('width',$parstack, $safeeval); - } - my $options=&Apache::lonxml::get_param('options',$parstack, - $safeeval); - 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); + my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack, + $safeeval); + $result.=&jme_img($jmeanswer,$answers[0],$width,$options); + } + } else { $result.= ''; } } elsif ($target eq 'edit') { @@ -214,7 +229,7 @@ sub start_organicresponse { my $options=&Apache::lonxml::get_param('options',$parstack, $safeeval); if ($options !~ /multipart/) { $options.=',multipart'; } - $result .=''. + $result .=''. &Apache::edit::text_arg('Starting Molecule:','molecule', $token,40); my $molecule=&Apache::lonxml::get_param('molecule',$parstack, @@ -222,17 +237,19 @@ sub start_organicresponse { $result .=&separate_jme_window(undef, &Apache::edit::html_element_name('molecule'), $molecule,$options); - $result .='
'; + $result .='
'; $result .=&Apache::edit::text_arg('Correct Answer:','answer', $token,40); - $result .=&Apache::edit::hidden_arg('jmeanswer',$token); + $result .='
'; + $result .=&Apache::edit::text_arg('JME string of the answer - automatically updated by "Insert Answer" in the JME pop-up (click pencil):', + 'jmeanswer',$token); my $jmeanswer=&Apache::lonxml::get_param('jmeanswer',$parstack, $safeeval); $result .=&separate_jme_window( &Apache::edit::html_element_name('answer'), &Apache::edit::html_element_name('jmeanswer'), $jmeanswer,$options); - $result .='
'; + $result .='
'; $result .=&Apache::edit::checked_arg('Options:','options', [ ['autoez','Auto E,Z stereochemistry'], ['multipart','Multipart Structures'], @@ -250,18 +267,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; @@ -275,9 +304,17 @@ sub end_organicresponse { $ad='INCORRECT'; } } - if ($ad && $Apache::lonhomework::type eq 'survey') { - $ad='SUBMITTED'; - } + if ($ad) { + if ($Apache::lonhomework::type eq 'survey') { + $ad='SUBMITTED'; + } elsif ($Apache::lonhomework::type eq 'surveycred') { + $ad='SUBMITTED_CREDIT'; + } elsif ($Apache::lonhomework::type eq 'anonsurvey') { + $ad='ANONYMOUS'; + } elsif ($Apache::lonhomework::type eq 'anonsurveycred') { + $ad='ANONYMOUS_CREDIT'; + } + } &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"}; @@ -293,7 +330,56 @@ sub end_organicresponse { } $result.=&Apache::response::answer_footer('organicresponse'); } - &Apache::response::end_response; + if ($target eq 'web') { + &Apache::response::setup_prior_tries_hash(\&format_prior_answer_organic, + ['molecule']) + } + + if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || + $target eq 'tex' || $target eq 'analyze') { + &Apache::lonxml::increment_counter(&Apache::response::repetition(), + "$partid.$id"); # part.response + if ($target eq 'analyze') { + $Apache::lonhomework::analyze{"$partid.$id.type"} = 'organicresponse'; + push (@{ $Apache::lonhomework::analyze{"parts"} },"$partid.$id"); + &Apache::lonhomework::set_bubble_lines(); + } + } + if ($target eq 'web' ) { + my ($showpencil,$shown_text); + if ($Apache::inputtags::status['-1'] eq 'CAN_ANSWER') { + $showpencil = 1; + } elsif (&Apache::response::show_answer()) { + my $jmeanswer=&Apache::lonxml::get_param('jmeanswer',$parstack, $safeeval); + if ($jmeanswer eq '') { + $showpencil = 1; + $shown_text="Show Your Last Answer"; + } + } + if ($showpencil) { + my $options=&Apache::lonxml::get_param('options',$parstack, + $safeeval); + + my $molecule; + if (defined($Apache::lonhomework::history{"resource.$partid.$id.molecule"})) { + $molecule=$Apache::lonhomework::history{"resource.$partid.$id.molecule"}; + } else { + $molecule=&Apache::lonxml::get_param('molecule',$parstack, + $safeeval); + } + $result.=&separate_jme_window("HWVAL_$id","MOLECULE_$id",$molecule, + $options,$shown_text); + } + } + &Apache::response::end_response(); + return $result; +} + +sub format_prior_answer_organic { + my ($mode,$answer,$other_data) = @_; + my $result=&mt('Smile representation: "[_1]"',''.$answer.''); + my $jme=$other_data->[0]; + $result.=&jme_img($jme,$answer,400); return $result; } @@ -309,14 +395,14 @@ sub start_organicstructure { if ($options =~ /border/) { $result.= ' border="1"'; } $result.=' />'; &Apache::lonnet::appenv( - 'cgi.'.$id.'.JME' => &Apache::lonnet::escape($molecule), - 'cgi.'.$id.'.PNG' => 1, - 'cgi.'.$id.'.WIDTH' => $width ); + {'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 (!$webheight) { $webheight = $webwidth; } if (!$texwidth) { $texwidth='90'; } $result = "%DYNAMICIMAGE:$webwidth:$webheight:$texwidth\n"; my $molecule=&Apache::lonxml::get_param('molecule',$parstack,$safeeval); @@ -325,19 +411,20 @@ sub start_organicstructure { '_'.time.'_'.$$.int(rand(1000)).'_organicstructure'; my $id=$filename; &Apache::lonnet::appenv( - 'cgi.'.$id.'.JME' => &Apache::lonnet::escape($molecule), - 'cgi.'.$id.'.PS' => 1, - 'cgi.'.$id.'.WIDTH' => $texwidth ); - $id=&Apache::lonnet::escape($id); + {'cgi.'.$id.'.JME' => &escape($molecule), + 'cgi.'.$id.'.PS' => 1, + 'cgi.'.$id.'.WIDTH' => $texwidth}); + $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}'; + $result .= '\graphicspath{{'.LONCAPA::tempdir(). + '}}\includegraphics[width='.$texwidth.' mm]{'.$filename.'.eps}'; if ($options =~ /border/) { $result.= '} '; } } elsif ($target eq 'edit') { $result .=&Apache::edit::tag_start($target,$token); $result .=&Apache::edit::text_arg('Width (pixels):','width',$token,5); $result .=&Apache::edit::text_arg('TeXwidth (mm):','texwidth',$token,5); - $result .=''; + $result .=''; $result .=&Apache::edit::text_arg('Molecule:','molecule',$token,40); my $molecule=&Apache::lonxml::get_param('molecule',$parstack, $safeeval); @@ -350,7 +437,7 @@ sub start_organicstructure { $result .=&separate_jme_window(undef, &Apache::edit::html_element_name('molecule'), $molecule,$options); - $result.="
"; + $result.="
"; $result .=&Apache::edit::checked_arg('Options:','options', [ ['reaction','Is a reaction'], ['border','Draw a border'] ], @@ -377,21 +464,34 @@ 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 $iconpath=$Apache::lonnet::perlvar{'lonIconsURL'}; + my $display=&mt('Edit Answer'); + 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=< // - +$display EDITREACTION return $result; } @@ -405,32 +505,25 @@ sub start_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"}; - 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); 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); + $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); my $answer=&Apache::lonxml::get_param('answer',$parstack, $safeeval); - $result .=''. + $result .=''. &Apache::edit::text_arg('Answer:','answer',$token,40); - $result .=&edit_reaction_button($id,&Apache::edit::html_element_name('answer'),$answer).''; + $result .=&edit_reaction_button($id,&Apache::edit::html_element_name('answer'),$answer).''; my $initial=&Apache::lonxml::get_param('initial',$parstack,$safeeval); - $result.=''. + $result.=''. &Apache::edit::text_arg('Initial Reaction:','initial',$token,40); - $result .=&edit_reaction_button($id,&Apache::edit::html_element_name('initial'),$initial).''; - + $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, @@ -444,12 +537,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; @@ -463,9 +567,17 @@ sub end_reactionresponse { $ad='INCORRECT'; } } - if ($ad && $Apache::lonhomework::type eq 'survey') { - $ad='SUBMITTED'; - } + if ($ad) { + if ($Apache::lonhomework::type eq 'survey') { + $ad='SUBMITTED'; + } elsif ($ad && $Apache::lonhomework::type eq 'surveycred') { + $ad='SUBMITTED_CREDIT'; + } elsif ($ad && $Apache::lonhomework::type eq 'anonsurvey') { + $ad='ANONYMOUS'; + } elsif ($ad && $Apache::lonhomework::type eq 'anonsurveycred') { + $ad='ANONYMOUS_CREDIT'; + } + } &Apache::response::handle_previous(\%previous,$ad); $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad; } @@ -481,10 +593,35 @@ sub end_reactionresponse { } $result.=&Apache::response::answer_footer('reactionresponse'); } - &Apache::response::end_response; + if ($target eq 'web') { + &Apache::response::setup_prior_tries_hash(\&format_prior_response_reaction); + } + + if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || + $target eq 'tex' || $target eq 'analyze') { + &Apache::lonxml::increment_counter(&Apache::response::repetition(), "$partid.$id"); + if ($target eq 'analyze') { + $Apache::lonhomework::analyze{"$partid.$id.type"} = 'reactionresponse'; + push (@{ $Apache::lonhomework::analyze{"parts"} },"$partid.$id"); + &Apache::lonhomework::set_bubble_lines(); + } + } + my $status=$Apache::inputtags::status['-1']; + if (($target eq 'web') && ($Apache::lonhomework::type ne 'exam') && ($status eq 'CAN_ANSWER')) { + my $reaction=$Apache::lonhomework::history{"resource.$partid.$id.submission"}; + if ($reaction eq '') { $reaction=&Apache::lonxml::get_param('initial',$parstack,$safeeval); } + $result.=&edit_reaction_button($id,"HWVAL_$id",$reaction); + } + &Apache::response::end_response(); return $result; } +sub format_prior_response_reaction { + my ($mode,$answer) =@_; + return ''. + &HTML::Entities::encode($answer,'"<>&').''; +} + sub start_chem { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_; my $result = '';