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

Diff for /loncom/homework/chemresponse.pm between versions 1.9 and 1.10

version 1.9, 2003/06/30 21:59:03 version 1.10, 2003/07/01 21:04:48
Line 229  sub end_organicstructure { Line 229  sub end_organicstructure {
   
 sub edit_reaction_button {  sub edit_reaction_button {
     my ($id,$field,$molecule)=@_;      my ($id,$field,$molecule)=@_;
       my $id_es=&Apache::lonnet::escape($id);
       my $field_es=&Apache::lonnet::escape($field);
       my $molecule_es=&Apache::lonnet::escape($molecule);
     my $result=<<EDITREACTION;      my $result=<<EDITREACTION;
 <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; field=$field; molecule=$molecule';" />  <script type="text/javascript">
       function create_reaction_window_${id}_${field} () {
    editor=window.open('','','width=500,height=270,scrollbars=no,resizable=yes');
    editor.document.open('text/html','replace');
    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?molecule=$molecule_es&id=$id_es&field=$field_es" name="editor" scrolling="no" /> </frameset> </html>');
       }
   </script>
   <input type='button' value='Edit Reaction' onClick="javascript:create_reaction_window_${id}_${field}();void(0);" />
 EDITREACTION  EDITREACTION
     return $result;      return $result;
 }  }
Line 239  sub start_reactionresponse { Line 249  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') {
       } elsif ($target eq 'web') {
  $result.=&edit_reaction_button($id,"HWVAL_$id");   $result.=&edit_reaction_button($id,"HWVAL_$id");
     } elsif ($target eq "edit") {      } elsif ($target eq "edit") {
  $result .=&Apache::edit::tag_start($target,$token);   $result .=&Apache::edit::tag_start($target,$token);
  $result .=&Apache::edit::text_arg('Answer:','answer',$token,40);  
  my $answer=&Apache::lonxml::get_param('answer',$parstack,   my $answer=&Apache::lonxml::get_param('answer',$parstack,
  $safeeval);   $safeeval);
  $result .=&edit_reaction_button($id,&Apache::edit::html_element_name('answer'),$answer);   $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();   $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 255  sub start_reactionresponse { Line 272  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 "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.9  
changed lines
  Added in v.1.10

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