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

Diff for /loncom/homework/chemresponse.pm between versions 1.39 and 1.44

version 1.39, 2004/09/27 20:59:21 version 1.44, 2005/01/21 22:10:59
Line 121  $molecule Line 121  $molecule
 CHEMPAGE  CHEMPAGE
     $body=&HTML::Entities::encode($body,'<>&"');      $body=&HTML::Entities::encode($body,'<>&"');
     $body=~s/\n/ /g;      $body=~s/\n/ /g;
     my $nothing= &Apache::lonhtmlcommon::javascript_nothing();      my $docopen=&Apache::lonhtmlcommon::javascript_docopen();
     my $result=<<CHEMINPUT;      my $result=<<CHEMINPUT;
 <input type="button" value="Draw Molecule" onClick="javascript:editor=window.open('','','width=500,height=500,scrollbars=no,resizable=yes');editor.document.open($nothing,'replace');editor.document.writeln('$body')" />  <input type="button" value="Draw Molecule" onClick="javascript:editor=window.open('','','width=500,height=500,scrollbars=no,resizable=yes');editor.$docopen;editor.document.writeln('$body')" />
 CHEMINPUT  CHEMINPUT
     return $result;      return $result;
 }  }
Line 136  sub start_organicresponse { Line 136  sub start_organicresponse {
     if ($target eq 'meta') {      if ($target eq 'meta') {
  $result=&Apache::response::meta_package_write('organicresponse');   $result=&Apache::response::meta_package_write('organicresponse');
     } elsif ($target eq 'web') {      } elsif ($target eq 'web') {
  my $molecule;   if (  &Apache::response::show_answer() ) {
  if (defined($Apache::lonhomework::history{"resource.$partid.$id.molecule"})) {      my $jmeanswer=&Apache::lonxml::get_param('jmeanswer',$parstack,
     $molecule=$Apache::lonhomework::history{"resource.$partid.$id.molecule"};       $safeeval);
       my $options=&Apache::lonxml::get_param('options',$parstack,
      $safeeval);
       my $width=&Apache::lonxml::get_param('width',$parstack,
      $safeeval);
       my $id=&Apache::loncommon::get_cgi_id();
       $result="<img src='/cgi-bin/convertjme.pl?$id'";
       if ($options =~ /border/) { $result.= ' border="1"'; }
       $result.=' />';
       &Apache::lonnet::appenv('cgi.'.$id.'.JME'   =>
              &Apache::lonnet::escape($jmeanswer),
       'cgi.'.$id.'.PNG'   => 1,
       'cgi.'.$id.'.WIDTH' => $width);
  } else {   } else {
     $molecule=&Apache::lonxml::get_param('molecule',$parstack,      my $molecule;
  $safeeval);      if (defined($Apache::lonhomework::history{"resource.$partid.$id.molecule"})) {
    $molecule=$Apache::lonhomework::history{"resource.$partid.$id.molecule"};
       } else {
    $molecule=&Apache::lonxml::get_param('molecule',$parstack,
        $safeeval);
       }
       my $options=&Apache::lonxml::get_param('options',$parstack,
      $safeeval);
       $result=&separate_jme_window("HWVAL_$id","MOLECULE_$id",$molecule,$options);
       $result.= '<input type="hidden" name="MOLECULE_'.$id.'" value="" />';
  }   }
  my $options=&Apache::lonxml::get_param('options',$parstack,  
        $safeeval);  
  $result=&separate_jme_window("HWVAL_$id","MOLECULE_$id",$molecule,$options);  
  $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,   my $options=&Apache::lonxml::get_param('options',$parstack,
Line 178  sub start_organicresponse { Line 195  sub start_organicresponse {
       ['reaction','Is a reaction'],        ['reaction','Is a reaction'],
       ['number','Able to number atoms'] ],        ['number','Able to number atoms'] ],
      ,$token);       ,$token);
    $result .=&Apache::edit::text_arg('Width of correct answer image:',
     'width',$token,10);
  $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',
      'options');       'options','width');
  if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }   if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
     }      }
     return $result;      return $result;
Line 211  sub end_organicresponse { Line 230  sub end_organicresponse {
     $ad='INCORRECT';      $ad='INCORRECT';
  }   }
     }      }
       if ($ad && $Apache::lonhomework::type eq 'survey') {
    $ad='SUBMITTED';
       }
     &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;
     $Apache::lonhomework::results{"resource.$partid.$id.molecule"}=$ENV{"form.MOLECULE_$id"};      $Apache::lonhomework::results{"resource.$partid.$id.molecule"}=$ENV{"form.MOLECULE_$id"};
Line 309  sub edit_reaction_button { Line 331  sub edit_reaction_button {
     my $id_es=&Apache::lonnet::escape($id);      my $id_es=&Apache::lonnet::escape($id);
     my $field_es=&Apache::lonnet::escape($field);      my $field_es=&Apache::lonnet::escape($field);
     my $reaction_es=&Apache::lonnet::escape($reaction);      my $reaction_es=&Apache::lonnet::escape($reaction);
     my $nothing= &Apache::lonhtmlcommon::javascript_nothing();      my $docopen=&Apache::lonhtmlcommon::javascript_docopen();
     my $result=<<EDITREACTION;      my $result=<<EDITREACTION;
 <script type="text/javascript">  <script type="text/javascript">
     function create_reaction_window_${id}_${field} () {      function create_reaction_window_${id}_${field} () {
  editor=window.open('','','width=500,height=270,scrollbars=no,resizable=yes');   editor=window.open('','','width=500,height=270,scrollbars=no,resizable=yes');
  editor.document.open($nothing,'replace');   editor.$docopen;
  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?inhibitmenu=yes" name="viewer" scrolling="no" />  <frame src="/res/adm/pages/reactionresponse/reaction_editor.html?inhibitmenu=yes&reaction=$reaction_es&id=$id_es&field=$field_es" name="editor" scrolling="no" /> </frameset> </html>');   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?inhibitmenu=yes" name="viewer" scrolling="no" />  <frame src="/res/adm/pages/reactionresponse/reaction_editor.html?inhibitmenu=yes&reaction=$reaction_es&id=$id_es&field=$field_es" name="editor" scrolling="no" /> </frameset> </html>');
     }      }
 </script>  </script>
Line 352  sub start_reactionresponse { Line 374  sub start_reactionresponse {
  $result .=&edit_reaction_button($id,&Apache::edit::html_element_name('answer'),$answer).'</nobr>';   $result .=&edit_reaction_button($id,&Apache::edit::html_element_name('answer'),$answer).'</nobr>';
  my $initial=&Apache::lonxml::get_param('initial',$parstack,$safeeval);   my $initial=&Apache::lonxml::get_param('initial',$parstack,$safeeval);
  $result.='<nobr>'.   $result.='<nobr>'.
     &Apache::edit::text_arg('Initial Reation:','initial',$token,40);      &Apache::edit::text_arg('Initial Reaction:','initial',$token,40);
  $result .=&edit_reaction_button($id,&Apache::edit::html_element_name('initial'),$initial).'</nobr>';   $result .=&edit_reaction_button($id,&Apache::edit::html_element_name('initial'),$initial).'</nobr>';
   
  $result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();   $result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
Line 387  sub end_reactionresponse { Line 409  sub end_reactionresponse {
     $ad='INCORRECT';      $ad='INCORRECT';
  }   }
     }      }
       if ($ad && $Apache::lonhomework::type eq 'survey') {
    $ad='SUBMITTED';
       }
     &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.39  
changed lines
  Added in v.1.44

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