[BACK]Return to chemresponse.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/chemresponse.pm between versions 1.11 and 1.13

version 1.11, 2003/07/01 21:10:43 version 1.13, 2003/10/06 21:39:51
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 164  sub end_organicresponse { Line 175  sub end_organicresponse {
  if ( $response =~ /[^\s]/) {   if ( $response =~ /[^\s]/) {
     my $partid = $Apache::inputtags::part;      my $partid = $Apache::inputtags::part;
     my $id = $Apache::inputtags::response['-1'];      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);      my %previous = &Apache::response::check_for_previous($response,$partid,$id);
     $Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;      $Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;
     &Apache::lonxml::debug("submitted a $response for $answer<br \>\n");  
     my $ad;      my $ad;
     if ($response eq $answer) {      foreach my $answer (@answers) {
  $ad='EXACT_ANS';   &Apache::lonxml::debug("submitted a $response for $answer<br \>\n");
     } else {   if ($response eq $answer) {
  $ad='INCORRECT';      $ad='EXACT_ANS';
       last;
    } else {
       $ad='INCORRECT';
    }
     }      }
     &Apache::response::handle_previous(\%previous,$ad);      &Apache::response::handle_previous(\%previous,$ad);
     $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad;      $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad;
Line 192  sub start_organicstructure { Line 206  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 217  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 281  sub end_reactionresponse { Line 310  sub end_reactionresponse {
  if ( $response =~ /[^\s]/) {   if ( $response =~ /[^\s]/) {
     my $partid = $Apache::inputtags::part;      my $partid = $Apache::inputtags::part;
     my $id = $Apache::inputtags::response['-1'];      my $id = $Apache::inputtags::response['-1'];
     my $answer=&Apache::lonxml::get_param('answer',$parstack,$safeeval);      my (@answers)=&Apache::lonxml::get_param('answer',$parstack,$safeeval);
     my %previous = &Apache::response::check_for_previous($response,$partid,$id);      my %previous = &Apache::response::check_for_previous($response,$partid,$id);
     $Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;      $Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;
     &Apache::lonxml::debug("submitted a $response for $answer<br \>\n");  
     my $ad;      my $ad;
     if ($response eq $answer) {      foreach my $answer (@answers) {
  $ad='EXACT_ANS';   &Apache::lonxml::debug("submitted a $response for $answer<br \>\n");
     } else {   if ($response eq $answer) {
  $ad='INCORRECT';      $ad='EXACT_ANS';
    } else {
       $ad='INCORRECT';
    }
     }      }
     &Apache::response::handle_previous(\%previous,$ad);      &Apache::response::handle_previous(\%previous,$ad);
     $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad;      $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad;
Removed from v.1.11  
changed lines
  Added in v.1.13

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