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

Diff for /loncom/homework/chemresponse.pm between versions 1.61 and 1.80

version 1.61, 2005/07/01 19:48:46 version 1.80, 2008/09/05 20:23:57
Line 31  use strict; Line 31  use strict;
 use Apache::lonxml;  use Apache::lonxml;
 use Apache::lonnet;  use Apache::lonnet;
 use Apache::lonlocal;  use Apache::lonlocal;
   use lib '/home/httpd/lib/perl/';
   use LONCAPA;
    
   
 BEGIN {  BEGIN {
     &Apache::lonxml::register('Apache::chemresponse',('organicresponse','organicstructure','reactionresponse','chem'));      &Apache::lonxml::register('Apache::chemresponse',('organicresponse','organicstructure','reactionresponse','chem'));
Line 87  JMESECTION Line 90  JMESECTION
     '<input type="button" name="submit" value="Insert Answer" onclick="javascript:submitSmiles();" />';      '<input type="button" name="submit" value="Insert Answer" onclick="javascript:submitSmiles();" />';
     }      }
   
     my $body=<<CHEMPAGE;      my $js = <<CHEMJS;
 <html>  
 <head>  
 <title>Molecule Editor</title>  
 <script type="text/javascript">  <script type="text/javascript">
 function submitSmiles() {  function submitSmiles() {
     jmeFile = document.applets.JME.jmeFile();      jmeFile = document.applets.JME.jmeFile();
Line 107  function openHelpWindow() { Line 107  function openHelpWindow() {
 }  }
 function substituent(r) {document.applets.JME.setSubstituent(r);}  function substituent(r) {document.applets.JME.setSubstituent(r);}
 </script>  </script>
 </head>  CHEMJS
 <body bgcolor="#ffffff">  
       my $start_page = 
           &Apache::loncommon::start_page('Molecule Editor',undef,
          {'only_body' => 1,
    'js_ready'  => 1,
    'bgcolor'   => '#FFFFFF',});
       my $end_page =
     &Apache::loncommon::end_page({'js_ready' => 1,});
   
       my $body=<<CHEMPAGE;
   $js
 <center>  <center>
 <form>  <form>
   <table width="440"><tr>    <table width="440"><tr>
Line 146  $insert_answer Line 156  $insert_answer
 <input type="button" value="  Help  " onclick = "javascript:openHelpWindow()" />  <input type="button" value="  Help  " onclick = "javascript:openHelpWindow()" />
 </form>  </form>
 </center>  </center>
 </body>  
 </html>  
 CHEMPAGE  CHEMPAGE
     $body=&HTML::Entities::encode($body,'<>&"');  
     $body=~s/\n/ /g;      $body=&Apache::loncommon::js_ready($body);
     my $nothing=&Apache::lonhtmlcommon::javascript_nothing();      my $nothing=&Apache::lonhtmlcommon::javascript_nothing();
     my $docopen=&Apache::lonhtmlcommon::javascript_docopen();      my $docopen=&Apache::lonhtmlcommon::javascript_docopen();
     my $display=&mt('Draw Molecule');      my $display=&mt('Draw Molecule');
     if (defined($shown_text)) { $display=&mt($shown_text); }      if (defined($shown_text)) { $display=&mt($shown_text); }
       my $iconpath=$Apache::lonnet::perlvar{'lonIconsURL'};
       my $function = 
    'LONCAPA_draw_molecule_'.&Apache::lonhtmlcommon::get_uniq_name();
     my $result=<<CHEMINPUT;      my $result=<<CHEMINPUT;
 <input type="button" value="$display" onclick="javascript:editor=window.open($nothing,'jmeedit','width=500,height=500,menubar=no,scrollbars=no,resizable=yes');editor.$docopen;editor.document.write('$body');editor.document.close();editor.focus()" />  <script type="text/javascript">
       function $function() {
    editor=window.open($nothing,'jmeedit','width=500,height=500,menubar=no,scrollbars=no,resizable=yes');
    editor.$docopen;
    editor.document.write('$start_page $body $end_page');
    editor.document.close();
    editor.focus();
       }
   </script>
   <a href="javascript:$function();void(0);"><img class="stift" src='$iconpath/stift.gif' alt='$display' title='$display' /></a>
 CHEMINPUT  CHEMINPUT
     return $result;      return $result;
 }  }
   
 sub jme_img {  sub jme_img {
     my ($jme,$smile,$width,$options)=@_;      my ($jme,$smile,$width,$options)=@_;
     my $id=&Apache::loncommon::get_cgi_id();      my $id=&Apache::loncommon::get_cgi_id();
     my $result='<img alt="'.$smile.'" src="/cgi-bin/convertjme.pl?'.$id.'"';      my $result='<img alt="'.$smile.'" src="/cgi-bin/convertjme.pl?'.$id.'"';
     if ($options =~ /border/) { $result.= ' border="1"'; }      if ($options =~ /border/) { $result.= ' border="1"'; }
     $result.=' />';      $result.=' />';
     &Apache::lonnet::appenv('cgi.'.$id.'.JME'   =>      &Apache::lonnet::appenv({'cgi.'.$id.'.JME'   =>
     &Apache::lonnet::escape($jme),       &escape($jme),
     'cgi.'.$id.'.PNG'   => 1,       'cgi.'.$id.'.PNG'   => 1,
     'cgi.'.$id.'.WIDTH' => $width);       'cgi.'.$id.'.WIDTH' => $width});
     return $result;      return $result;
 }  }
   
Line 206  sub start_organicresponse { Line 225  sub start_organicresponse {
     if (&Apache::response::show_answer()) {      if (&Apache::response::show_answer()) {
  $shown_text="Show Your Last Answer";   $shown_text="Show Your Last Answer";
     }      }
     $result=&separate_jme_window("HWVAL_$id","MOLECULE_$id",$molecule,      #stift $result=&separate_jme_window("HWVAL_$id","MOLECULE_$id",$molecule,
  $options,$shown_text);  # $options,$shown_text);
     $result.= '<input type="hidden" name="MOLECULE_'.$id.'" value="" />';      $result.= '<input type="hidden" name="MOLECULE_'.$id.'" value="" />';
  }   }
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
Line 226  sub start_organicresponse { Line 245  sub start_organicresponse {
  $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);
  $result .=&Apache::edit::hidden_arg('jmeanswer',$token);   $result .='</nobr><br /><nobr>';
    $result .=&Apache::edit::text_arg('JME string of the answer (automatically updated when using the Draw Molecule button):',
     'jmeanswer',$token);
  my $jmeanswer=&Apache::lonxml::get_param('jmeanswer',$parstack,   my $jmeanswer=&Apache::lonxml::get_param('jmeanswer',$parstack,
  $safeeval);   $safeeval);
  $result .=&separate_jme_window(   $result .=&separate_jme_window(
Line 251  sub start_organicresponse { Line 272  sub start_organicresponse {
      'options','width');       'options','width');
  if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }   if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
     }      }
   
     return $result;      return $result;
 }  }
   
 sub end_organicresponse {  sub end_organicresponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;      my $result;
     if ($target eq 'grade' && &Apache::response::submitted()) {  
       my $partid = $Apache::inputtags::part;
       my $id = $Apache::inputtags::response['-1'];
   
       if ($target eq 'grade' 
    && &Apache::response::submitted()
    && $Apache::lonhomework::type eq 'exam') {
   
    &Apache::response::scored_response($partid,$id);
   
       } elsif ($target eq 'grade' 
    && &Apache::response::submitted()
    && $Apache::lonhomework::type ne 'exam') {
   
  &Apache::response::setup_params($$tagstack[-1],$safeeval);   &Apache::response::setup_params($$tagstack[-1],$safeeval);
  my $response = &Apache::response::getresponse();   my $response = &Apache::response::getresponse();
  if ( $response =~ /[^\s]/) {   if ( $response =~ /[^\s]/) {
     my $partid = $Apache::inputtags::part;  
     my $id = $Apache::inputtags::response['-1'];  
     my (@answers)=&Apache::lonxml::get_param_var('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;
Line 294  sub end_organicresponse { Line 327  sub end_organicresponse {
  }   }
  $result.=&Apache::response::answer_footer('organicresponse');   $result.=&Apache::response::answer_footer('organicresponse');
     }      }
     &Apache::response::end_response;      if ($target eq 'web') {
    &Apache::response::setup_prior_tries_hash(\&format_prior_answer_organic,
     ['molecule'])
       }
   
       if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || 
    $target eq 'tex' || $target eq 'analyze') {
    &Apache::lonxml::increment_counter(&Apache::response::repetition(), 
      "$partid.$id"); # part.response
    if ($target eq 'analyze') {
               $Apache::lonhomework::analyze{"$partid.$id.type"} = 'organicresponse';
       &Apache::lonhomework::set_bubble_lines();
    }
       }
       if (($target eq 'web' ) && ($Apache::lonhomework::type ne 'exam') && ($Apache::inputtags::status['-1'] eq 'CAN_ANSWER')){
               my $options=&Apache::lonxml::get_param('options',$parstack,
                                                      $safeeval);
               my $shown_text;
               if (&Apache::response::show_answer()) {
                   $shown_text="Show Your Last Answer";
               }
       my $molecule;
       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);
       }
    $result.=&separate_jme_window("HWVAL_$id","MOLECULE_$id",$molecule,
                                $options,$shown_text);
       }
       &Apache::response::end_response();
       return $result;
   }
   
   sub format_prior_answer_organic {
       my ($mode,$answer,$other_data) = @_;
       my $result=&mt('Smile representation: "[_1]"','<tt>'.$answer.'</tt>');
       my $jme=$other_data->[0];
       $result.=&jme_img($jme,$answer,400);
     return $result;      return $result;
 }  }
   
Line 310  sub start_organicstructure { Line 382  sub start_organicstructure {
  if ($options =~ /border/) { $result.= ' border="1"'; }   if ($options =~ /border/) { $result.= ' border="1"'; }
  $result.=' />';   $result.=' />';
  &Apache::lonnet::appenv(   &Apache::lonnet::appenv(
             'cgi.'.$id.'.JME'   => &Apache::lonnet::escape($molecule),              {'cgi.'.$id.'.JME'   => &escape($molecule),
     'cgi.'.$id.'.PNG' => 1,       'cgi.'.$id.'.PNG' => 1,
     'cgi.'.$id.'.WIDTH' => $width );       'cgi.'.$id.'.WIDTH' => $width});
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  my $texwidth=&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,undef,1);   my $texwidth=&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,undef,1);
  my $webwidth=&Apache::lonxml::get_param('width', $parstack, $safeeval);   my $webwidth=&Apache::lonxml::get_param('width', $parstack, $safeeval);
  my $webheight=&Apache::lonxml::get_param('height', $parstack, $safeeval);   my $webheight=&Apache::lonxml::get_param('height', $parstack, $safeeval);
  if ($webheight) { $webheight = $webwidth; }   if (!$webheight) { $webheight = $webwidth; }
  if (!$texwidth) { $texwidth='90'; }   if (!$texwidth) { $texwidth='90'; }
  $result = "%DYNAMICIMAGE:$webwidth:$webheight:$texwidth\n";   $result = "%DYNAMICIMAGE:$webwidth:$webheight:$texwidth\n";
  my $molecule=&Apache::lonxml::get_param('molecule',$parstack,$safeeval);   my $molecule=&Apache::lonxml::get_param('molecule',$parstack,$safeeval);
Line 326  sub start_organicstructure { Line 398  sub start_organicstructure {
     '_'.time.'_'.$$.int(rand(1000)).'_organicstructure';      '_'.time.'_'.$$.int(rand(1000)).'_organicstructure';
  my $id=$filename;   my $id=$filename;
  &Apache::lonnet::appenv(   &Apache::lonnet::appenv(
      'cgi.'.$id.'.JME'   => &Apache::lonnet::escape($molecule),       {'cgi.'.$id.'.JME'   => &escape($molecule),
      'cgi.'.$id.'.PS' => 1,        'cgi.'.$id.'.PS' => 1,
      'cgi.'.$id.'.WIDTH' => $texwidth );        'cgi.'.$id.'.WIDTH' => $texwidth});
  $id=&Apache::lonnet::escape($id);   $id=&escape($id);
  &Apache::lonxml::register_ssi("/cgi-bin/convertjme.pl?$id");   &Apache::lonxml::register_ssi("/cgi-bin/convertjme.pl?$id");
  if ($options =~ /border/) { $result.= '\fbox{'; }   if ($options =~ /border/) { $result.= '\fbox{'; }
  $result .= '\graphicspath{{/home/httpd/perl/tmp/}}\includegraphics[width='.$texwidth.' mm]{'.$filename.'.eps}';   $result .= '\graphicspath{{/home/httpd/perl/tmp/}}\includegraphics[width='.$texwidth.' mm]{'.$filename.'.eps}';
Line 378  sub end_organicstructure { Line 450  sub end_organicstructure {
   
 sub edit_reaction_button {  sub edit_reaction_button {
     my ($id,$field,$reaction)=@_;      my ($id,$field,$reaction)=@_;
     my $id_es=&Apache::lonnet::escape($id);      my $id_es=&escape($id);
     my $field_es=&Apache::lonnet::escape($field);      my $field_es=&escape($field);
     my $reaction_es=&Apache::lonnet::escape($reaction);      my $reaction_es=&escape($reaction);
     my $docopen=&Apache::lonhtmlcommon::javascript_docopen();      my $docopen=&Apache::lonhtmlcommon::javascript_docopen();
       my $iconpath=$Apache::lonnet::perlvar{'lonIconsURL'};
       my $display=&mt('Edit Answer');
       my $start_page = 
    &Apache::loncommon::start_page('LON-CAPA Reaction Editor',undef,
          {'frameset'    => 1,
    'js_ready'    => 1,
    'add_entries' => {
       'rows'   => "30%,*",
       'border' => "0",}},);
       my $end_page = 
    &Apache::loncommon::end_page({'frameset' => 1,
         'js_ready' => 1});
     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.$docopen;   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('$start_page <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" /> $end_page');
    editor.document.close();
     }      }
 // -->  // -->
 </script>  </script>
 <input type='button' value='Edit Answer' onclick="javascript:create_reaction_window_${id}_${field}();void(0);" />  <a href="javascript:create_reaction_window_${id}_${field}();void(0);"><img class="stift" src='$iconpath/stift.gif' alt='$display' title='$display' /></a>
 EDITREACTION  EDITREACTION
     return $result;      return $result;
 }  }
Line 408  sub start_reactionresponse { Line 493  sub start_reactionresponse {
  my $id = $Apache::inputtags::response['-1'];   my $id = $Apache::inputtags::response['-1'];
  my $reaction=$Apache::lonhomework::history{"resource.$partid.$id.submission"};   my $reaction=$Apache::lonhomework::history{"resource.$partid.$id.submission"};
  if ($reaction eq '') {  $reaction=&Apache::lonxml::get_param('initial',$parstack,$safeeval); }   if ($reaction eq '') {  $reaction=&Apache::lonxml::get_param('initial',$parstack,$safeeval); }
  my $status=$Apache::inputtags::status['-1'];  
  if ($status eq 'CAN_ANSWER') {  
     $result.=&edit_reaction_button($id,"HWVAL_$id",$reaction);  
  }  
  if (  &Apache::response::show_answer() ) {   if (  &Apache::response::show_answer() ) {
     my $ans=&Apache::lonxml::get_param('answer',$parstack,$safeeval);      my $ans=&Apache::lonxml::get_param('answer',$parstack,$safeeval);
     if (!$Apache::lonxml::default_homework_loaded) {      if (!$Apache::lonxml::default_homework_loaded) {
  &Apache::lonxml::default_homework_load($safeeval);   &Apache::lonxml::default_homework_load($safeeval);
     }      }
     @Apache::scripttag::parser_env = @_;      @Apache::scripttag::parser_env = @_;
     $Apache::inputtags::answertxt{$id}=&Apache::run::run("return &chemparse(q\0$ans\0);",$safeeval);      $Apache::inputtags::answertxt{$id}=[&Apache::run::run("return &chemparse(q\0$ans\0);",$safeeval)];
  }   }
     } elsif ($target eq "edit") {      } elsif ($target eq "edit") {
  $result .=&Apache::edit::tag_start($target,$token);   $result .=&Apache::edit::tag_start($target,$token);
Line 426  sub start_reactionresponse { Line 507  sub start_reactionresponse {
  $safeeval);   $safeeval);
  $result .='<nobr>'.   $result .='<nobr>'.
     &Apache::edit::text_arg('Answer:','answer',$token,40);      &Apache::edit::text_arg('Answer:','answer',$token,40);
  $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 Reaction:','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 .=&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') {
Line 445  sub start_reactionresponse { Line 524  sub start_reactionresponse {
 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 'grade' && &Apache::response::submitted()) {  
       my $partid = $Apache::inputtags::part;
       my $id = $Apache::inputtags::response['-1'];
   
       if ($target eq 'grade' 
    && &Apache::response::submitted()
    && $Apache::lonhomework::type eq 'exam') {
   
    &Apache::response::scored_response($partid,$id);
   
       } elsif ($target eq 'grade' 
    && &Apache::response::submitted()
    && $Apache::lonhomework::type ne 'exam') {
   
  &Apache::response::setup_params($$tagstack[-1],$safeeval);   &Apache::response::setup_params($$tagstack[-1],$safeeval);
  my $response = &Apache::response::getresponse();   my $response = &Apache::response::getresponse();
  if ( $response =~ /[^\s]/) {   if ( $response =~ /[^\s]/) {
     my $partid = $Apache::inputtags::part;  
     my $id = $Apache::inputtags::response['-1'];  
     my (@answers)=&Apache::lonxml::get_param_var('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;
Line 482  sub end_reactionresponse { Line 572  sub end_reactionresponse {
  }   }
  $result.=&Apache::response::answer_footer('reactionresponse');   $result.=&Apache::response::answer_footer('reactionresponse');
     }      }
     &Apache::response::end_response;      if ($target eq 'web') {
    &Apache::response::setup_prior_tries_hash(\&format_prior_response_reaction);
       }
   
       if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || 
    $target eq 'tex' || $target eq 'analyze') {
    &Apache::lonxml::increment_counter(&Apache::response::repetition(), "$partid.$id");
           if ($target eq 'analyze') {
               $Apache::lonhomework::analyze{"$partid.$id.type"} = 'reactionresponse';
               &Apache::lonhomework::set_bubble_lines();
           }
       }
        my $status=$Apache::inputtags::status['-1'];
           if  (($target eq 'web') && ($Apache::lonhomework::type ne 'exam') && ($status eq 'CAN_ANSWER')) {
                my $partid = $Apache::inputtags::part;
                my $id = $Apache::inputtags::response['-1'];
                my $reaction=$Apache::lonhomework::history{"resource.$partid.$id.submission"};
                $result.=&edit_reaction_button($id,"HWVAL_$id",$reaction);
   
           }  
       &Apache::response::end_response();
     return $result;      return $result;
 }  }
   
   sub format_prior_response_reaction {
       my ($mode,$answer) =@_;
       return '<span class="LC_prior_reaction">'.
       &HTML::Entities::encode($answer,'"<>&').'</span>';
   }
   
 sub start_chem {  sub start_chem {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
     my $result = '';      my $result = '';
Removed from v.1.61  
changed lines
  Added in v.1.80

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