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

Diff for /loncom/homework/lonhomework.pm between versions 1.266 and 1.271

version 1.266, 2007/04/06 21:21:34 version 1.271, 2007/08/24 21:13:53
Line 112  sub get_target { Line 112  sub get_target {
  return ('web');   return ('web');
     }      }
  } else {   } else {
     if ( $env{'form.problemmode'} eq &mt('View') ||      if ($env{'form.problemstate'} eq 'WEB_GRADE') {
    #$env{'form.webgrade'} = 'yes';
    return ('grade','webgrade','answer');
       } elsif ( $env{'form.problemmode'} eq &mt('View') ||
  $env{'form.problemmode'} eq &mt('Discard Edits and View')) {   $env{'form.problemmode'} eq &mt('Discard Edits and View')) {
  if ( defined($env{'form.submitted'}) &&   if ( defined($env{'form.submitted'}) &&
      (!defined($env{'form.resetdata'})) &&       (!defined($env{'form.resetdata'})) &&
Line 185  sub proctor_checked_in { Line 188  sub proctor_checked_in {
     return 0;      return 0;
 }  }
   
 $Apache::lonxml::browse='';  
 sub check_ip_acc {  sub check_ip_acc {
     my ($acc)=@_;      my ($acc)=@_;
     &Apache::lonxml::debug("acc is $acc");      &Apache::lonxml::debug("acc is $acc");
Line 858  sub editxmlmode { Line 860  sub editxmlmode {
  if ($cols > 80) { $cols = 80; }   if ($cols > 80) { $cols = 80; }
  if ($cols < 70) { $cols = 70; }   if ($cols < 70) { $cols = 70; }
  if ($rows < 20) { $rows = 20; }   if ($rows < 20) { $rows = 20; }
    my $js =
       &Apache::edit::js_change_detection(). 
       &Apache::loncommon::resize_textarea_js();
    my $only_body =  ($env{'environment.remote'} eq 'off')? 0 : 1;
  my $start_page =    my $start_page = 
     &Apache::loncommon::start_page(&mt("EditXML [_1]",$file),      &Apache::loncommon::start_page(&mt("EditXML [_1]",$file),$js,
    &Apache::edit::js_change_detection(),     {'no_auto_mt_title' => 1,
    {'no_auto_mt_title' => 1,});      'only_body'        => $only_body,
       'add_entries'      => {
    'onresize' => q[resize_textarea('LC_editxmltext','LC_aftertextarea')],
    'onload'   => q[resize_textarea('LC_editxmltext','LC_aftertextarea')],
       }});
   
  $result.=$start_page.   $result.=$start_page.
     &renderpage($request,$file,['no_output_web'],1).      &renderpage($request,$file,['no_output_web'],1).
Line 878  sub editxmlmode { Line 888  sub editxmlmode {
             <input type="submit" name="submit" accesskey="v" value="'.&mt('Submit Changes and View').'" />              <input type="submit" name="submit" accesskey="v" value="'.&mt('Submit Changes and View').'" />
             <hr />              <hr />
             ' . $xml_help . '              ' . $xml_help . '
             <textarea '.&Apache::edit::element_change_detection().' style="width:100%" rows="'.$rows.'" cols="'.$cols.'" name="editxmltext">'.              <textarea '.&Apache::edit::element_change_detection().
     &HTML::Entities::encode($problem,'<>&"').'</textarea><br />                ' rows="'.$rows.'" cols="'.$cols.'" style="width:100%" '.
             <input type="submit" name="submit" accesskey="s" value="'.&mt('Submit Changes').'" />        ' name="editxmltext" id="LC_editxmltext">'.
             <input type="submit" name="submit" accesskey="v" value="'.&mt('Submit Changes and View').'" />        &HTML::Entities::encode($problem,'<>&"').'</textarea>
               <div id="LC_aftertextarea">
                   <input type="submit" name="submit" accesskey="s" value="'.&mt('Submit Changes').'" />
                   <input type="submit" name="submit" accesskey="v" value="'.&mt('Submit Changes and View').'" />
               </div>
             </form>'.&Apache::loncommon::end_page();              </form>'.&Apache::loncommon::end_page();
  &Apache::lonxml::add_messages(\$result);   &Apache::lonxml::add_messages(\$result);
  $request->print($result);   $request->print($result);
Line 898  sub renderpage { Line 912  sub renderpage {
     my @targets = @{$targets || [&get_target()]};      my @targets = @{$targets || [&get_target()]};
     &Apache::lonhomework::showhashsubset(\%env,'form.');      &Apache::lonhomework::showhashsubset(\%env,'form.');
     &Apache::lonxml::debug("Running targets ".join(':',@targets));      &Apache::lonxml::debug("Running targets ".join(':',@targets));
   
     my $overall_result;      my $overall_result;
     foreach my $target (@targets) {      foreach my $target (@targets) {
  # FIXME need to do something intelligent when a problem goes   # FIXME need to do something intelligent when a problem goes
Line 974  sub get_template_list { Line 989  sub get_template_list {
     my @allnames;      my @allnames;
     &Apache::lonxml::debug("Looking for :$extension:");      &Apache::lonxml::debug("Looking for :$extension:");
     foreach my $file (</home/httpd/html/res/adm/includes/templates/*.$extension>) {      foreach my $file (</home/httpd/html/res/adm/includes/templates/*.$extension>) {
    &Apache::lonxml::debug("Looking at $file");
  my $name=&Apache::lonnet::metadata($file,'title');   my $name=&Apache::lonnet::metadata($file,'title');
    &Apache::lonxml::debug("Got a name $name");
  if ($namewanted && ($name eq $namewanted)) {   if ($namewanted && ($name eq $namewanted)) {
     $result=$file;      $result=$file;
     last;      last;
Line 1044  $errormsg Line 1061  $errormsg
     return '';      return '';
 }  }
   
   sub update_construct_style {
       if ($env{'request.state'} eq "construct"
    && $env{'form.problemmode'} eq &mt('View') 
    &&  defined($env{'form.submitted'})
    && !defined($env{'form.resetdata'})
    && !defined($env{'form.newrandomization'})) {
    if ((!$env{'form.style_file'} && $env{'construct.style'})
       ||$env{'form.clear_style_file'}) {
       &Apache::lonnet::delenv('construct\\.style');
    } elsif ($env{'form.style_file'} 
       && $env{'construct.style'} ne $env{'form.style_file'}) {
       &Apache::lonnet::appenv('construct.style' => 
           $env{'form.style_file'});
    }
       }
   }
   
   
 sub handler {  sub handler {
     #my $t0 = [&gettimeofday()];      #my $t0 = [&gettimeofday()];
     my $request=$_[0];      my $request=$_[0];
Line 1094  sub handler { Line 1129  sub handler {
     } elsif ($env{'form.problemmode'} eq &mt('Calculate answers')) {      } elsif ($env{'form.problemmode'} eq &mt('Calculate answers')) {
  &analyze($request,$file);   &analyze($request,$file);
     } else {      } else {
    &update_construct_style();
  &renderpage($request,$file);   &renderpage($request,$file);
     }      }
  } else {   } else {
Removed from v.1.266  
changed lines
  Added in v.1.271

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