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

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

version 1.78, 2008/03/12 02:46:52 version 1.80, 2008/09/05 20:23:57
Line 163  CHEMPAGE Line 163  CHEMPAGE
     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 =       my $function = 
  'LONCAPA_draw_molecule_'.&Apache::lonhtmlcommon::get_uniq_name();   'LONCAPA_draw_molecule_'.&Apache::lonhtmlcommon::get_uniq_name();
     my $result=<<CHEMINPUT;      my $result=<<CHEMINPUT;
Line 175  CHEMPAGE Line 176  CHEMPAGE
  editor.focus();   editor.focus();
     }      }
 </script>  </script>
 <input type="button" value="$display" onclick="javascript:$function();void(0);" />  <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();
Line 225  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 341  sub end_organicresponse { Line 341  sub end_organicresponse {
     &Apache::lonhomework::set_bubble_lines();      &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();      &Apache::response::end_response();
     return $result;      return $result;
 }  }
Line 437  sub edit_reaction_button { Line 454  sub edit_reaction_button {
     my $field_es=&escape($field);      my $field_es=&escape($field);
     my $reaction_es=&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 =       my $start_page = 
  &Apache::loncommon::start_page('LON-CAPA Reaction Editor',undef,   &Apache::loncommon::start_page('LON-CAPA Reaction Editor',undef,
        {'frameset'    => 1,         {'frameset'    => 1,
Line 458  sub edit_reaction_button { Line 477  sub edit_reaction_button {
     }      }
 // -->  // -->
 </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 474  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) {
Line 492  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 571  sub end_reactionresponse { Line 584  sub end_reactionresponse {
             &Apache::lonhomework::set_bubble_lines();              &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();      &Apache::response::end_response();
     return $result;      return $result;
 }  }
Removed from v.1.78  
changed lines
  Added in v.1.80

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