Diff for /loncom/homework/chemresponse.pm between versions 1.7 and 1.12

version 1.7, 2003/06/30 20:41:12 version 1.12, 2003/09/08 22:08:37
Line 51  SMILESECTION Line 51  SMILESECTION
 JMESECTION  JMESECTION
     }      }
   
       if ($molecule) { $molecule="<param name='jme' value='$molecule' />"; }
     my $body=<<CHEMPAGE;      my $body=<<CHEMPAGE;
 <html>  <html>
 <head>  <head>
Line 75  function openHelpWindow() { Line 76  function openHelpWindow() {
 <center>  <center>
 <applet code="JME.class" name="JME" archive="/adm/jme/JME.jar" width="97%" height="78%">  <applet code="JME.class" name="JME" archive="/adm/jme/JME.jar" width="97%" height="78%">
 You have to enable Java and JavaScript on your machine.  You have to enable Java and JavaScript on your machine.
 <param name="jme" value="$molecule" />  $molecule
 <param name="options" value="$options" />  <param name="options" value="$options" />
 </applet><br />  </applet><br />
 <font face="arial,helvetica,sans-serif" size=-1><a href="http://www.molinspiration.com/jme/index.html">JME Editor</a> courtesy of Peter Ertl, Novartis</font>  <font face="arial,helvetica,sans-serif" size=-1><a href="http://www.molinspiration.com/jme/index.html">JME Editor</a> courtesy of Peter Ertl, Novartis</font>
Line 123  sub start_organicresponse { Line 124  sub start_organicresponse {
  $result.= '<input type="hidden" name="MOLECULE_'.$id.'" value="" />';   $result.= '<input type="hidden" name="MOLECULE_'.$id.'" value="" />';
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result .=&Apache::edit::tag_start($target,$token);   $result .=&Apache::edit::tag_start($target,$token);
    my $options=&Apache::lonxml::get_param('options',$parstack,
          $safeeval);
    if ($options !~ /multipart/) { $options.=',multipart'; }
  $result .='<nobr>'.   $result .='<nobr>'.
     &Apache::edit::text_arg('Starting Molecule:','molecule',      &Apache::edit::text_arg('Starting Molecule:','molecule',
     $token,40);      $token,40);
Line 130  sub start_organicresponse { Line 134  sub start_organicresponse {
  $safeeval);   $safeeval);
  $result .=&seperate_jme_window(undef,   $result .=&seperate_jme_window(undef,
       &Apache::edit::html_element_name('molecule'),        &Apache::edit::html_element_name('molecule'),
       $molecule,'multipart');        $molecule,$options);
  $result .='</nobr><br /><nobr>';   $result .='</nobr><br /><nobr>';
  $result .=&Apache::edit::text_arg('Correct Answer:','answer',   $result .=&Apache::edit::text_arg('Correct Answer:','answer',
   $token,40);    $token,40);
Line 140  sub start_organicresponse { Line 144  sub start_organicresponse {
  $result .=&seperate_jme_window(   $result .=&seperate_jme_window(
                       &Apache::edit::html_element_name('answer'),                        &Apache::edit::html_element_name('answer'),
                       &Apache::edit::html_element_name('jmeanswer'),                        &Apache::edit::html_element_name('jmeanswer'),
       $jmeanswer,'multipart');        $jmeanswer,$options);
  $result .='</nobr>'.   $result .='</nobr><br />';
     &Apache::edit::select_arg('Multipart:','multipart',   $result .=&Apache::edit::checked_arg('Options:','options',
       ['no','yes'],$token);      [ ['autoez','Auto E,Z sterochemistry'],
         ['multipart','MultiPart Structures'],
         ['hydrogens','Show Hydrogens'],
         ['nostereo','No stereochemistry'],
         ['reaction','Is a reaction'],
         ['number','Able to number atoms'],
         ['border','Draw a border'] ],
        ,$token);
  $result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();   $result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
     } elsif ($target eq 'modified') {      } elsif ($target eq 'modified') {
  my $constructtag=&Apache::edit::get_new_args($token,$parstack,   my $constructtag=&Apache::edit::get_new_args($token,$parstack,
      $safeeval,'molecule',       $safeeval,'molecule',
      'answer','jmeanswer',       'answer','jmeanswer',
      'multipart');       'options');
  if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }   if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
     }      }
     return $result;      return $result;
Line 192  sub start_organicstructure { Line 203  sub start_organicstructure {
  my $width=&Apache::lonxml::get_param('width',$parstack,$safeeval);   my $width=&Apache::lonxml::get_param('width',$parstack,$safeeval);
  my $height=&Apache::lonxml::get_param('height',$parstack,$safeeval);   my $height=&Apache::lonxml::get_param('height',$parstack,$safeeval);
  my $molecule=&Apache::lonxml::get_param('molecule',$parstack,$safeeval);   my $molecule=&Apache::lonxml::get_param('molecule',$parstack,$safeeval);
    my $options=&Apache::lonxml::get_param('options',$parstack,$safeeval);
  $result=<<CHEMOUTPUT;   $result=<<CHEMOUTPUT;
 <applet code="JME.class" archive="/adm/jme/JME.jar" width="$width" height="$height">  <applet code="JME.class" archive="/adm/jme/JME.jar" width="$width" height="$height">
 <param name="options" value="depict border" />  <param name="options" value="depict,$options" />
 <param name="jme" value="$molecule" />  <param name="jme" value="$molecule" />
 </applet>  </applet>
 CHEMOUTPUT  CHEMOUTPUT
Line 202  CHEMOUTPUT Line 214  CHEMOUTPUT
  $result .=&Apache::edit::tag_start($target,$token);   $result .=&Apache::edit::tag_start($target,$token);
  $result .=&Apache::edit::text_arg('Width:','width',$token,5);   $result .=&Apache::edit::text_arg('Width:','width',$token,5);
  $result .=&Apache::edit::text_arg('Height:','height',$token,5);   $result .=&Apache::edit::text_arg('Height:','height',$token,5);
    $result .='<nobr>';
  $result .=&Apache::edit::text_arg('Molecule:','molecule',$token,40);   $result .=&Apache::edit::text_arg('Molecule:','molecule',$token,40);
  my $molecule=&Apache::lonxml::get_param('molecule',$parstack,   my $molecule=&Apache::lonxml::get_param('molecule',$parstack,
  $safeeval);   $safeeval);
    my $options=&Apache::lonxml::get_param('options',$parstack,
          $safeeval);
    if ($options !~ /reaction/) {
       $options.= ',multipart,number';
    }
      
  $result .=&seperate_jme_window(undef,   $result .=&seperate_jme_window(undef,
       &Apache::edit::html_element_name('molecule'),   &Apache::edit::html_element_name('molecule'),
       $molecule,'multipart');         $molecule,$options);
    $result.="</nobr><br />";
    $result .=&Apache::edit::checked_arg('Options:','options',
        [ ['hydrogens','Show Hydrogens'],
          ['reaction','Is a reaction'],
          ['border','Draw a border'] ],
        $token);
  $result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();   $result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
     } elsif ($target eq 'modified') {      } elsif ($target eq 'modified') {
  my $constructtag=&Apache::edit::get_new_args($token,$parstack,   my $constructtag=&Apache::edit::get_new_args($token,$parstack,
      $safeeval,'molecule',       $safeeval,'molecule',
      'width','height');       'width','height',
        'options');
  if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }   if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
     }      }
     return $result;      return $result;
Line 227  sub end_organicstructure { Line 253  sub end_organicstructure {
     return $result;      return $result;
 }  }
   
 sub reaction_javascript {  sub edit_reaction_button {
     my $rightarrow;      my ($id,$field,$reaction)=@_;
     if ($ENV{'browser.unicode'}) {      my $id_es=&Apache::lonnet::escape($id);
  $rightarrow=" &#8594; "      my $field_es=&Apache::lonnet::escape($field);
     } else {      my $reaction_es=&Apache::lonnet::escape($reaction);
  $rightarrow=" <font face=symbol>&reg;</font> ";      my $result=<<EDITREACTION;
     }  <script type="text/javascript">
     my $result=<<REACTIONJAVASCRIPT;      function create_reaction_window_${id}_${field} () {
     <script language="JavaScript">   editor=window.open('','','width=500,height=270,scrollbars=no,resizable=yes');
    editor.document.open('text/html','replace');
 var level;   editor.document.writeln('<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"><html> <head><title>LON-CAPA Reaction Editor</title></head><frameset rows="30%,*" border="0">  <frame src="/res/adm/pages/reactionresponse/reaction_viewer.html" name="viewer" scrolling="no" />  <frame src="/res/adm/pages/reactionresponse/reaction_editor.html?reaction=$reaction_es&id=$id_es&field=$field_es" name="editor" scrolling="no" /> </frameset> </html>');
 var reactants;  
 var products;  
   
   
 function parse_reaction(string) {  
   var reaction_array = string.split('->');  
   var i;  
   reactants = new Array(0);  
   products = new Array(0);  
   
   if (reaction_array.length > 0)  
     reactants = reaction_array[0].split(' +');  
   if (reaction_array.length > 1)  
     products = reaction_array[1].split(' +');  
 }  
   
 function to_capa(string) {  
   var reaction = "";  
   var i;  
   
   parse_reaction(string);  
   
   for (i = 0; i < reactants.length; i++)  
     reactants[i] = capa_component(reactants[i]);  
   for (i = 0; i < products.length; i++)  
     products[i] = capa_component(products[i]);  
   
   reactants.sort();  
   products.sort();  
   
   for (i = 0; i < reactants.length-1; i++) {  
     reaction += reactants[i];  
     reaction += " + ";  
   }  
   if (i < reactants.length)  
     reaction += reactants[i];  
   if (products.length > 0) {  
     reaction += " -> ";  
     for (i = 0; i < products.length-1; i++) {  
       reaction += products[i];  
       reaction += " + ";  
     }      }
     if (i < products.length)  
       reaction += products[i];  
   }  
   
   return reaction;  
 }  
   
 function capa_component(string) {  
   var reactant = "";  
   var i = 0;  
   level = 0;  
   
   for (;string.substring(i,i+1) == ' ';i++)  
     ;  
   for (;isDigit(string.substring(i,i+1));i++)  
     reactant += string.substring(i,i+1);  
   for (;i < string.length;i++)  
     reactant +=  capa_char(string.substring(i,i+1));  
   
   return reactant;  
 }  
   
 function capa_char(chr) {  
   if (level == 0) { // baseline  
     if (chr == '^')  
       level = 1;  
     if (chr == ' ')  
       return "";  
     return chr;  
   }  
   if (level == 1) { // superscript  
     if (isDigit(chr))  
       return chr;  
     level = 0;  
     return chr;  
   }  
 }  
   
 function to_html(string) {  
   var reaction = "";  
   var i;  
   
   parse_reaction(string);  
   for (i = 0; i < reactants.length-1; i++) {  
     reaction += html_component(reactants[i]);  
     reaction += " + ";  
   }  
   if (i < reactants.length)  
     reaction += html_component(reactants[i]);  
   
   if (products.length > 0) {  
     reaction += " $rightarrow ";  
     for (i = 0; i < products.length-1; i++) {  
       reaction += html_component(products[i]);  
       reaction += " + ";  
     }  
     if (i < products.length)  
       reaction += html_component(products[i]);  
   }  
   
   return reaction;  
 }  
   
 function html_component(string) {  
   var reactant = "";  
   var i = 0;  
   level = 0;  
   
   for (;string.substring(i,i+1) == ' ';i++)  
     ;  
   for (;isDigit(string.substring(i,i+1));i++)  
     reactant += string.substring(i,i+1);  
   for (;i < string.length;i++)  
     reactant +=  html_char(string.substring(i,i+1));  
   
   return reactant;  
 }  
   
 function html_char(chr) {  
   if (level == 0) { // baseline  
     if (isDigit(chr))  
       return chr.sub();  
     if (chr == '^') {  
       level = 1;  
       return "";  
     }  
     if (chr == '+') // baseline or superscript  
       return "?";  
     if (chr == ' ')  
       return "";  
     return chr;  
   }  
   if (level == 1) { // superscript  
     if (isDigit(chr))  
       return chr.sup();  
     if (chr == '+' || chr == '-') {  
       level = 0;  
       return chr.sup();  
     }  
     if (chr == ' ') {  
       level = 0;  
       return "";  
     }  
     level = 0;  
     return chr;  
   }  
 }  
   
 function isDigit(string) {  
   if (string >= '0' && string <='9')  
     return 1;  
   else  
     return 0;  
 }  
   
 function openHelpWindow() {  
   window.open("reaction_help.html","","scrollbars=yes,resizable=yes,width=550,height=600")  
 }  
   
 function submitReaction() {  
   reaction = to_capa(document.form.text.value);  
   if (reaction == "") {  
     alert("Nothing to submit");  
   }  
   else {  
     name = "INPUT" + ((problem < 10) ? "0" : "") + problem;  
     i = 0;  
     while (parent.opener.document.CAPA.elements[i].name != name)  
       i++;  
     parent.opener.document.CAPA.elements[i].value = reaction;  
     parent.opener.document.CAPA.submit();  
   }  
 }  
 </script>  </script>
 REACTIONJAVASCRIPT  <input type='button' value='Edit Reaction' onClick="javascript:create_reaction_window_${id}_${field}();void(0);" />
   EDITREACTION
     return $result;      return $result;
 }  }
   
Line 422  sub start_reactionresponse { Line 275  sub start_reactionresponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;      my $result;
     my $id = &Apache::response::start_response($parstack,$safeeval);      my $id = &Apache::response::start_response($parstack,$safeeval);
     if ($target eq 'web') {      if ($target eq 'meta') {
  $result.=<<EDITREACTION;      } elsif ($target eq 'web') {
 <input type='button' value='Edit Reaction' onClick="javascript:editor=window.open('/res/adm/reactionresponse/reaction_window.html','','width=500,height=270,scrollbars=no,resizable=yes'); document.cookie='problem=$id';" />   my $partid = $Apache::inputtags::part;
 EDITREACTION   my $id = $Apache::inputtags::response['-1'];
    my $reaction=$Apache::lonhomework::history{"resource.$partid.$id.submission"};
 # $result.=&reaction_javascript();   $result.=&edit_reaction_button($id,"HWVAL_$id",$reaction);
 # $result.='<iframe name="REACTION_'.$id.'" width="200" height="100" src="/adm/jme/reaction_viewer.html"></iframe>';  
 # $result.='<input type="button" value="Check" onClick = "javascript:newWindow=open(\'\',\'new_W\',\'width=500,height=200,scrollbars=1\');newWindow.document.open(\'text/html\',\'replace\');newWindow.document.writeln(\'<center><br />\'+to_html(document.lonhomework.HWVAL_'.$id.'.value)+\'</center><input type=&quot;button&quot; value=&quot;  Close  &quot; onClick = &quot;parent.window.close()&quot; />\');newWindow.document.close()" />'  
     } elsif ($target eq "edit") {      } elsif ($target eq "edit") {
    $result .=&Apache::edit::tag_start($target,$token);
    my $answer=&Apache::lonxml::get_param('answer',$parstack,
    $safeeval);
    $result .='<nobr>'.
       &Apache::edit::text_arg('Answer:','answer',$token,40);
    $result .=&edit_reaction_button($id,&Apache::edit::html_element_name('answer'),$answer).'</nobr>';
   
    $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;      return $result;
 }  }
Line 438  EDITREACTION Line 301  EDITREACTION
 sub end_reactionresponse {  sub end_reactionresponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;      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 $answer=&Apache::lonxml::get_param('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<br \>\n");
       my $ad;
       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,'');   $result.= &Apache::edit::tag_end($target,$token,'');
     }      }
     &Apache::response::end_response;      &Apache::response::end_response;

Removed from v.1.7  
changed lines
  Added in v.1.12


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>