--- loncom/homework/chemresponse.pm 2003/06/30 21:59:03 1.9 +++ loncom/homework/chemresponse.pm 2003/10/18 07:24:35 1.19 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # chemical equation style response # -# $Id: chemresponse.pm,v 1.9 2003/06/30 21:59:03 albertel Exp $ +# $Id: chemresponse.pm,v 1.19 2003/10/18 07:24:35 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -51,6 +51,7 @@ SMILESECTION JMESECTION } + if ($molecule) { $molecule=''; } my $body=< @@ -75,7 +76,7 @@ function openHelpWindow() { You have to enable Java and JavaScript on your machine. - +$molecule
JME Editor courtesy of Peter Ertl, Novartis @@ -112,17 +113,15 @@ sub start_organicresponse { $molecule=&Apache::lonxml::get_param('molecule',$parstack, $safeeval); } - my $multipart=&Apache::lonxml::get_param('multipart',$parstack, - $safeeval); - if ($multipart eq 'yes') { - $multipart = 'multipart'; - } else { - $multipart =''; - } - $result=&seperate_jme_window("HWVAL_$id","MOLECULE_$id",$molecule,$multipart); + my $options=&Apache::lonxml::get_param('options',$parstack, + $safeeval); + $result=&seperate_jme_window("HWVAL_$id","MOLECULE_$id",$molecule,$options); $result.= ''; } elsif ($target eq 'edit') { $result .=&Apache::edit::tag_start($target,$token); + my $options=&Apache::lonxml::get_param('options',$parstack, + $safeeval); + if ($options !~ /multipart/) { $options.=',multipart'; } $result .=''. &Apache::edit::text_arg('Starting Molecule:','molecule', $token,40); @@ -130,7 +129,7 @@ sub start_organicresponse { $safeeval); $result .=&seperate_jme_window(undef, &Apache::edit::html_element_name('molecule'), - $molecule,'multipart'); + $molecule,$options); $result .='
'; $result .=&Apache::edit::text_arg('Correct Answer:','answer', $token,40); @@ -140,16 +139,21 @@ sub start_organicresponse { $result .=&seperate_jme_window( &Apache::edit::html_element_name('answer'), &Apache::edit::html_element_name('jmeanswer'), - $jmeanswer,'multipart'); - $result .=''. - &Apache::edit::select_arg('Multipart:','multipart', - ['no','yes'],$token); + $jmeanswer,$options); + $result .='
'; + $result .=&Apache::edit::checked_arg('Options:','options', + [ ['autoez','Auto E,Z sterochemistry'], + ['multipart','Multipart Structures'], + ['nostereo','No stereochemistry'], + ['reaction','Is a reaction'], + ['number','Able to number atoms'] ], + ,$token); $result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); } elsif ($target eq 'modified') { my $constructtag=&Apache::edit::get_new_args($token,$parstack, $safeeval,'molecule', 'answer','jmeanswer', - 'multipart'); + 'options'); if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } } return $result; @@ -164,15 +168,18 @@ sub end_organicresponse { if ( $response =~ /[^\s]/) { my $partid = $Apache::inputtags::part; my $id = $Apache::inputtags::response['-1']; - my $answer=&Apache::lonxml::get_param('answer',$parstack,$safeeval); + 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; - &Apache::lonxml::debug("submitted a $response for $answer
\n"); my $ad; - if ($response eq $answer) { - $ad='EXACT_ANS'; - } else { - $ad='INCORRECT'; + foreach my $answer (@answers) { + &Apache::lonxml::debug("submitted a $response for $answer
\n"); + if ($response eq $answer) { + $ad='EXACT_ANS'; + last; + } else { + $ad='INCORRECT'; + } } &Apache::response::handle_previous(\%previous,$ad); $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad; @@ -180,6 +187,14 @@ sub end_organicresponse { } } elsif ($target eq "edit") { $result.= &Apache::edit::tag_end($target,$token,''); + } elsif ($target eq 'answer') { + my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack, + $safeeval); + $result.=&Apache::response::answer_header('organicresponse'); + foreach my $answer (@answers) { + $result.=&Apache::response::answer_part('organicresponse',$answer); + } + $result.=&Apache::response::answer_footer('organicresponse'); } &Apache::response::end_response; return $result; @@ -190,29 +205,60 @@ sub start_organicstructure { my $result; if ($target eq 'web') { my $width=&Apache::lonxml::get_param('width',$parstack,$safeeval); - my $height=&Apache::lonxml::get_param('height',$parstack,$safeeval); my $molecule=&Apache::lonxml::get_param('molecule',$parstack,$safeeval); - $result=< - - - -CHEMOUTPUT + my $options=&Apache::lonxml::get_param('options',$parstack,$safeeval); + my $id=time.'_'.int(rand(1000)); + $result="

&Apache::lonnet::escape($molecule), + 'cgi.'.$id.'.PNG' => 1, + 'cgi.'.$id.'.WIDTH' => $width ); + } elsif ($target eq 'tex') { + my $texwidth=&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,1); + if (!$texwidth) { $texwidth='90'; } + 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.'.PS' => 1, + 'cgi.'.$id.'.WIDTH' => $texwidth ); + $id=&Apache::lonnet::escape($id); + &Apache::lonxml::register_ssi("/cgi-bin/convertjme.pl?$id"); + $result = '\graphicspath{{/home/httpd/perl/tmp/}}\includegraphics[width='.$texwidth.' mm]{'.$filename.'.eps}'; } 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 .=''; $result .=&Apache::edit::text_arg('Molecule:','molecule',$token,40); my $molecule=&Apache::lonxml::get_param('molecule',$parstack, $safeeval); + my $options=&Apache::lonxml::get_param('options',$parstack, + $safeeval); + if ($options !~ /reaction/) { + $options.= ',multipart,number'; + } + $result .=&seperate_jme_window(undef, - &Apache::edit::html_element_name('molecule'), - $molecule,'multipart'); + &Apache::edit::html_element_name('molecule'), + $molecule,$options); + $result.="
"; + $result .=&Apache::edit::checked_arg('Options:','options', + [ ['reaction','Is a reaction'], + ['border','Draw a border'] ], + $token); $result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); } elsif ($target eq 'modified') { my $constructtag=&Apache::edit::get_new_args($token,$parstack, $safeeval,'molecule', - 'width','height'); + 'width','height', + 'texwidth','options'); if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } } return $result; @@ -228,9 +274,19 @@ sub end_organicstructure { } sub edit_reaction_button { - my ($id,$field,$molecule)=@_; + 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 $result=< + + EDITREACTION return $result; } @@ -239,15 +295,25 @@ sub start_reactionresponse { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result; my $id = &Apache::response::start_response($parstack,$safeeval); - if ($target eq 'web') { - $result.=&edit_reaction_button($id,"HWVAL_$id"); + if ($target eq 'meta') { + } 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); } elsif ($target eq "edit") { $result .=&Apache::edit::tag_start($target,$token); - $result .=&Apache::edit::text_arg('Answer:','answer',$token,40); my $answer=&Apache::lonxml::get_param('answer',$parstack, $safeeval); - $result .=&edit_reaction_button($id,&Apache::edit::html_element_name('answer'),$answer); + $result .=''. + &Apache::edit::text_arg('Answer:','answer',$token,40); + $result .=&edit_reaction_button($id,&Apache::edit::html_element_name('answer'),$answer).''; + $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'); + if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } } return $result; } @@ -255,8 +321,38 @@ sub start_reactionresponse { sub end_reactionresponse { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result; - if ($target eq "edit") { + if ($target eq 'grade' && defined($ENV{'form.submitted'})) { + &Apache::response::setup_params($$tagstack[-1]); + 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; + my $ad; + foreach my $answer (@answers) { + &Apache::lonxml::debug("submitted a $response for $answer
\n"); + if ($response eq $answer) { + $ad='EXACT_ANS'; + } else { + $ad='INCORRECT'; + } + } + &Apache::response::handle_previous(\%previous,$ad); + $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad; + } + } elsif ($target eq "edit") { $result.= &Apache::edit::tag_end($target,$token,''); + } elsif ($target eq 'answer') { + my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack, + $safeeval); + $result.=&Apache::response::answer_header('reactionresponse'); + foreach my $answer (@answers) { + $result.=&Apache::response::answer_part('reactionresponse', + $answer); + } + $result.=&Apache::response::answer_footer('reactionresponse'); } &Apache::response::end_response; return $result;