--- loncom/homework/chemresponse.pm 2003/05/04 08:45:22 1.1 +++ loncom/homework/chemresponse.pm 2003/05/04 22:14:53 1.2 @@ -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.2 2003/05/04 22:14:53 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -36,7 +36,21 @@ BEGIN { } sub seperate_jme_window { - my ($id,$molecule)=@_; + my ($smile_input,$jme_input,$molecule)=@_; + 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"); } @@ -98,8 +111,33 @@ sub start_chemresponse { $molecule=&Apache::lonxml::get_param('molecule',$parstack, $safeeval); } - $result=&seperate_jme_window($id,$molecule); + $result=&seperate_jme_window("HWVAL_$id","MOLECULE_$id",$molecule); $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); + $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); + $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'); + if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } } return $result; } @@ -127,6 +165,8 @@ 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;