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

Diff for /loncom/homework/structuretags.pm between versions 1.369 and 1.374

version 1.369, 2006/11/20 11:52:10 version 1.374, 2007/02/24 01:44:14
Line 88  sub page_start { Line 88  sub page_start {
    $parstack,$parser,$safeeval);     $parstack,$parser,$safeeval);
     }      }
   
       $extra_head.= '
   <script type="text/javascript">
   function setSubmittedPart (part) {
      this.document.lonhomework.submitted.value="part_"+part;
   }
   </script>
   ';
   
     my %body_args;      my %body_args;
     if (defined($found{'html'})) {      if (defined($found{'html'})) {
  $body_args{'skip_phases'}{'head'}=1;   $body_args{'skip_phases'}{'head'}=1;
Line 213  sub setup_rndseed { Line 221  sub setup_rndseed {
     }      }
     $env{'form.rndseed'}=$rndseed;      $env{'form.rndseed'}=$rndseed;
  }   }
  if ($env{'form.resetdata'} eq &mt('New Problem Variation') ||   if ( ($env{'form.resetdata'} eq &mt('New Problem Variation')
         && $env{'form.submitted'} eq 'yes')  ||
     $env{'form.newrandomization'} eq &mt('New Randomization')) {      $env{'form.newrandomization'} eq &mt('New Randomization')) {
     srand(time);      srand(time);
     $rndseed=int(rand(2100000000));      $rndseed=int(rand(2100000000));
Line 276  sub option { Line 285  sub option {
 sub problem_web_to_edit_header {  sub problem_web_to_edit_header {
     my ($rndseed)=@_;      my ($rndseed)=@_;
     my $result.='<input type="hidden" name="problemmode" value="'.&mt('View').'" />';      my $result.='<input type="hidden" name="problemmode" value="'.&mt('View').'" />';
     if (!$Apache::lonhomework::parsing_a_task) {      $result .= '<input type="submit" name="problemmode" accesskey="e" value="'.&mt('Edit').'" />';
  $result .= '<input type="submit" name="problemmode" accesskey="e" value="'.&mt('Edit').'" />';  
     }  
     $result .= '<input type="submit" name="problemmode" accesskey="x" value="'.&mt('EditXML').'" />      $result .= '<input type="submit" name="problemmode" accesskey="x" value="'.&mt('EditXML').'" />
              <input type="submit" name="newrandomization" accesskey="a" value="'.&mt('New Randomization').'" />               <input type="submit" name="newrandomization" accesskey="a" value="'.&mt('New Randomization').'" />
              <input type="submit" name="resetdata" accesskey="r" value="'.&mt('Reset Submissions').'" />               <input type="submit" name="resetdata" accesskey="r" value="'.&mt('Reset Submissions').'" />
Line 293  sub problem_web_to_edit_header { Line 300  sub problem_web_to_edit_header {
  : &mt('&nbsp;Show&nbsp;All&nbsp;Foils');   : &mt('&nbsp;Show&nbsp;All&nbsp;Foils');
   
     if (defined($env{'form.showallfoils'})) { $result.='checked="on"'; }      if (defined($env{'form.showallfoils'})) { $result.='checked="on"'; }
     $result.= ' />'.$show_all_foils_text.      $result.= ' />'.$show_all_foils_text.'</label>'.
  &Apache::loncommon::help_open_topic('Problem_Editor_Testing_Area','Testing Problems').   &Apache::loncommon::help_open_topic('Problem_Editor_Testing_Area','Testing Problems').
  '</label><hr />';   '<hr />';
     if (!$Apache::lonhomework::parsing_a_task) {      if (!$Apache::lonhomework::parsing_a_task) {
  $result.="   $result.="
 <nobr>  <nobr>
Line 360  sub initialize_storage { Line 367  sub initialize_storage {
   
  my $namespace = $symb || $env{'request.uri'};   my $namespace = $symb || $env{'request.uri'};
  if ($env{'form.resetdata'} eq &mt('Reset Submissions') ||   if ($env{'form.resetdata'} eq &mt('Reset Submissions') ||
     $env{'form.resetdata'} eq &mt('New Problem Variation') ||      ($env{'form.resetdata'} eq &mt('New Problem Variation')
        && $env{'form.submitted'} eq 'yes') ||
     $env{'form.newrandomization'} eq &mt('New Randomization')) {      $env{'form.newrandomization'} eq &mt('New Randomization')) {
     &Apache::lonnet::tmpreset($namespace,'',$domain,$name);      &Apache::lonnet::tmpreset($namespace,'',$domain,$name);
     &Apache::lonxml::debug("Attempt reset");      &Apache::lonxml::debug("Attempt reset");
Line 787  sub end_problem { Line 795  sub end_problem {
     }      }
   
     if ($target eq 'tex') {      if ($target eq 'tex') {
   
  # Figure out the front matter and replace the   # Figure out the front matter and replace the
  # INSERTTEXFRONTMATTERHERE in result with it.  note that we do   # INSERTTEXFRONTMATTERHERE in result with it.  note that we do
  # this in end_problem because whether or not we display due   # this in end_problem because whether or not we display due
Line 963  sub end_problem { Line 970  sub end_problem {
 sub start_library {  sub start_library {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my ($result,$form_tag_start);      my ($result,$form_tag_start);
     if ($$tagstack[0] eq 'library') {      if ($#$tagstack eq 0 && $$tagstack[0] eq 'library') {
  &init_problem_globals('library');   &init_problem_globals('library');
  $Apache::lonhomework::type='problem';   $Apache::lonhomework::type='problem';
     }      }
Line 978  sub start_library { Line 985  sub start_library {
  $result=$token->[4];   $result=$token->[4];
  $result.=&Apache::edit::handle_insert();   $result.=&Apache::edit::handle_insert();
     } elsif (($target eq 'web' || $target eq 'webgrade')      } elsif (($target eq 'web' || $target eq 'webgrade')
      && $$tagstack[0] eq 'library'        && ($#$tagstack eq 0 && $$tagstack[0] eq 'library')
      && $env{'request.state'} eq "construct" ) {       && $env{'request.state'} eq "construct" ) {
  my $name=&get_resource_name($parstack,$safeeval);   my $name=&get_resource_name($parstack,$safeeval);
  ($result,$form_tag_start)=   ($result,$form_tag_start)=
Line 997  sub end_library { Line 1004  sub end_library {
     my $result='';      my $result='';
     if ($target eq 'edit') {      if ($target eq 'edit') {
  $result=&problem_edit_footer();   $result=&problem_edit_footer();
     } elsif ($target eq 'web' && $$tagstack[0] ne 'problem' &&      } elsif ($target eq 'web' 
      $env{'request.state'} eq "construct") {       && ($#$tagstack eq 0 && $$tagstack[0] eq 'library') 
        && $env{'request.state'} eq "construct") {
  $result.='</form>'.&Apache::loncommon::end_page({'discussion' => 1});   $result.='</form>'.&Apache::loncommon::end_page({'discussion' => 1});
     }      }
     if ($$tagstack[0] eq 'library') { &reset_problem_globals('library') };      if ( $#$tagstack eq 0 && $$tagstack[0] eq 'library') {
    &reset_problem_globals('library');
       }
     return $result;      return $result;
 }  }
   
Line 1490  sub end_preduedate { Line 1500  sub end_preduedate {
 # tags if the conditions are not right to display it.  # tags if the conditions are not right to display it.
 sub start_postanswerdate {  sub start_postanswerdate {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
       my $pav = &Apache::lonnet::allowed('pav', $env{'request.course.id'}) ||
    &Apache::lonnet::allowed('pav',
      $env{'request.course.id'}.'/'.$env{'request.course.sec'});
     if ($target eq 'web' || $target eq 'grade' || $target eq 'webgrade' ||      if ($target eq 'web' || $target eq 'grade' || $target eq 'webgrade' ||
  $target eq 'tex') {   $target eq 'tex' ) {
  if ($Apache::lonhomework::scantronmode ||   if ($Apache::lonhomework::scantronmode ||
     $Apache::inputtags::status['-1'] ne 'SHOW_ANSWER') {      $Apache::inputtags::status['-1'] ne 'SHOW_ANSWER' ||
       (($target eq 'tex') && !$pav)) {
     &Apache::lonxml::get_all_text("/postanswerdate",$parser,$style);      &Apache::lonxml::get_all_text("/postanswerdate",$parser,$style);
  }   }
     }      }
Removed from v.1.369  
changed lines
  Added in v.1.374

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