--- loncom/homework/chemresponse.pm 2003/05/04 08:45:22 1.1 +++ loncom/homework/chemresponse.pm 2003/06/30 21:59:03 1.9 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # chemical equation style response # -# $Id: chemresponse.pm,v 1.1 2003/05/04 08:45:22 albertel Exp $ +# $Id: chemresponse.pm,v 1.9 2003/06/30 21:59:03 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -32,11 +32,25 @@ use Apache::lonxml; use Apache::lonnet; BEGIN { - &Apache::lonxml::register('Apache::chemresponse',('chemresponse','chemstructure')); + &Apache::lonxml::register('Apache::chemresponse',('organicresponse','organicstructure','reactionresponse')); } sub seperate_jme_window { - my ($id,$molecule)=@_; + my ($smile_input,$jme_input,$molecule,$options)=@_; + my $smilesection; + if (defined($smile_input)) { + $smilesection=< @@ -47,14 +61,13 @@ function submitSmiles() { if (smiles == "") { alert("Nothing to submit"); } else { - jmeFile = document.applets.JME.jmeFile(); - opener.document.lonhomework.HWVAL_$id.value = smiles; - opener.document.lonhomework.MOLECULE_$id.value = jmeFile; + $smilesection + $jmesection window.close(); } } function openHelpWindow() { - window.open("/adm/jme/jme_help.html","","scrollbars=yes,resizable=yes,width=500,height=600") + window.open("/adm/jme/jme_help.html","","scrollbars=yes,resizable=yes,width=500,height=600"); } @@ -63,6 +76,7 @@ function openHelpWindow() { You have to enable Java and JavaScript on your machine. +
JME Editor courtesy of Peter Ertl, Novartis
@@ -84,7 +98,7 @@ CHEMINPUT return $result; } -sub start_chemresponse { +sub start_organicresponse { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result; my $partid = $Apache::inputtags::part; @@ -98,13 +112,50 @@ sub start_chemresponse { $molecule=&Apache::lonxml::get_param('molecule',$parstack, $safeeval); } - $result=&seperate_jme_window($id,$molecule); + 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); $result.= ''; + } elsif ($target eq 'edit') { + $result .=&Apache::edit::tag_start($target,$token); + $result .=''. + &Apache::edit::text_arg('Starting Molecule:','molecule', + $token,40); + my $molecule=&Apache::lonxml::get_param('molecule',$parstack, + $safeeval); + $result .=&seperate_jme_window(undef, + &Apache::edit::html_element_name('molecule'), + $molecule,'multipart'); + $result .='
'; + $result .=&Apache::edit::text_arg('Correct Answer:','answer', + $token,40); + $result .=&Apache::edit::hidden_arg('jmeanswer',$token); + my $jmeanswer=&Apache::lonxml::get_param('jmeanswer',$parstack, + $safeeval); + $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); + $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'); + if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } } return $result; } -sub end_chemresponse { +sub end_organicresponse { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result; if ($target eq 'grade' && defined($ENV{'form.submitted'})) { @@ -127,15 +178,88 @@ sub end_chemresponse { $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad; $Apache::lonhomework::results{"resource.$partid.$id.molecule"}=$ENV{"form.MOLECULE_$id"}; } + } elsif ($target eq "edit") { + $result.= &Apache::edit::tag_end($target,$token,''); } &Apache::response::end_response; return $result; } -sub start_chemstructure { +sub start_organicstructure { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + 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 + } 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('Molecule:','molecule',$token,40); + my $molecule=&Apache::lonxml::get_param('molecule',$parstack, + $safeeval); + $result .=&seperate_jme_window(undef, + &Apache::edit::html_element_name('molecule'), + $molecule,'multipart'); + $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'); + if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } + } + return $result; +} + +sub end_organicstructure { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $result; + if ($target eq "edit") { + $result.= &Apache::edit::tag_end($target,$token,''); + } + return $result; +} + +sub edit_reaction_button { + my ($id,$field,$molecule)=@_; + my $result=< +EDITREACTION + return $result; } -sub end_chemstructure { +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"); + } 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::end_row().&Apache::edit::start_spanning_row(); + } + return $result; +} + +sub end_reactionresponse { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $result; + if ($target eq "edit") { + $result.= &Apache::edit::tag_end($target,$token,''); + } + &Apache::response::end_response; + return $result; } 1;