Diff for /loncom/homework/structuretags.pm between versions 1.187 and 1.195

version 1.187, 2003/06/19 20:04:16 version 1.195, 2003/07/11 15:10:54
Line 38  use Apache::File(); Line 38  use Apache::File();
 use Apache::lonmenu;  use Apache::lonmenu;
   
 BEGIN {  BEGIN {
     &Apache::lonxml::register('Apache::structuretags',('block','languageblock','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext'));      &Apache::lonxml::register('Apache::structuretags',('block','languageblock','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext',
   'simpleeditbutton'));
 }  }
   
 sub start_web {  sub start_web {
Line 149  sub setup_rndseed { Line 150  sub setup_rndseed {
  }   }
  if ($ENV{'form.resetdata'} eq 'New Problem Variation' ||   if ($ENV{'form.resetdata'} eq 'New Problem Variation' ||
     $ENV{'form.newrandomization'} eq 'New Randomization') {      $ENV{'form.newrandomization'} eq 'New Randomization') {
     $rndseed=time;      srand(time);
     if ($rndseed eq $ENV{'form.rndseed'}) {      $rndseed=int(rand(2100000000));
  srand($rndseed);  
  $rndseed=int(rand(1000000000));  
     }  
     $ENV{'form.rndseed'}=$rndseed;      $ENV{'form.rndseed'}=$rndseed;
     delete($ENV{'form.resetdata'});      delete($ENV{'form.resetdata'});
     delete($ENV{'form.newrandomization'});      delete($ENV{'form.newrandomization'});
Line 409  sub start_problem { Line 407  sub start_problem {
     }      }
  } elsif ($target eq 'tex') {   } elsif ($target eq 'tex') {
     my $startminipage = '';      my $startminipage = '';
     if ($ENV{'form.problem_split'} ne 'yes') {      if (not $ENV{'form.problem_split'}=~/yes/) {
  $startminipage = '\begin{minipage}{\textwidth}';   $startminipage = '\begin{minipage}{\textwidth}';
     }      }
     my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);      my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
Line 507  sub end_problem { Line 505  sub end_problem {
  }   }
     } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER' ||      } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER' ||
      $status eq 'UNCHECKEDOUT' ) {       $status eq 'UNCHECKEDOUT' ) {
  if ($target ne 'tex') {   if ($target ne 'tex' &&
       $ENV{'form.answer_output_mode'} ne 'tex') {
     $result.="</body>\n";      $result.="</body>\n";
  }   }
     }      }
Line 515  sub end_problem { Line 514  sub end_problem {
  $result.=&Apache::lonxml::xmlend();   $result.=&Apache::lonxml::xmlend();
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  my $endminipage = '';   my $endminipage = '';
  if ($ENV{'form.problem_split'} ne 'yes') {   if (not $ENV{'form.problem_split'}=~/yes/) {
     $endminipage = '\end{minipage}';      $endminipage = '\end{minipage}';
  }   }
  $result .= '\keephidden{ENDOFPROBLEM}\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}';   $result .= '\keephidden{ENDOFPROBLEM}\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}';
Line 903  sub start_part { Line 902  sub start_part {
  if ( $target eq "web" ) {   if ( $target eq "web" ) {
     $result="<br />Part is not open to be viewed. It $accessmsg<br />";      $result="<br />Part is not open to be viewed. It $accessmsg<br />";
  } elsif ( $target eq 'tex' ) {   } elsif ( $target eq 'tex' ) {
     $result="\\end{minipage}\\vskip 0 mm Part is not open to be viewed. It $accessmsg \\\\\\begin{minipage}{\\textwidth}";      if (not $ENV{'form.problem_split'}=~/yes/) {
    $result="\\end{minipage}\\vskip 0 mm Part is not open to be viewed. It $accessmsg \\\\\\begin{minipage}{\\textwidth}";
       } else {
    $result="\\vskip 0 mm Part is not open to be viewed. It $accessmsg \\\\";
       }
  }   }
     } else {      } else {
  if ($target eq 'tex') {   if ($target eq 'tex') {
     $result.='\noindent \end{minipage}\vskip 0 mm \noindent \begin{minipage}{\textwidth}\noindent';      if (not $ENV{'form.problem_split'}=~/yes/) {
    $result.='\noindent \end{minipage}\vskip 0 mm \noindent \begin{minipage}{\textwidth}\noindent';
       }
     my $weight = &Apache::lonnet::EXT("resource.$id.weight");      my $weight = &Apache::lonnet::EXT("resource.$id.weight");
     if ($Apache::lonhomework::type eq 'exam') { $result .= '\fbox{\textit{'.$weight.' pt}}';}      if ($Apache::lonhomework::type eq 'exam') { $result .= '\fbox{\textit{'.$weight.' pt}}';}
  }   }
Line 1040  sub end_startouttext { Line 1045  sub end_startouttext {
                  &Apache::edit::insertlist($target,$token).                   &Apache::edit::insertlist($target,$token).
  &Apache::edit::end_row().   &Apache::edit::end_row().
                  &Apache::edit::start_spanning_row()."\n"                   &Apache::edit::start_spanning_row()."\n"
  .'<table><tr><td>'.   . &Apache::loncommon::helpLatexCheatsheet () .
  &Apache::loncommon::help_open_topic("Greek_Symbols",  
      'Greek Symbols',  
      undef,undef,600)  
  .'</td><td>'.  
  &Apache::loncommon::help_open_topic("Other_Symbols",  
      'Other Symbols',  
      undef,undef,600)  
  .'</td></tr></table>'.  
  &Apache::edit::editfield($token->[1],$text,"",80,4);   &Apache::edit::editfield($token->[1],$text,"",80,4);
     }      }
     if ($target eq 'modified') {      if ($target eq 'modified') {
Line 1092  sub delete_startouttext { Line 1089  sub delete_startouttext {
     return 1;      return 1;
 }  }
   
   sub start_simpleeditbutton {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
       my $result='';
       if (($target eq 'web') &&
           (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) {
           my $url=$ENV{'REQUEST_URI'};
           $url=~s/\?.*$//;
    $result='<table width="100%" bgcolor="#FFFFAA" border="2"><tr><td>'.
                   '<a href="'.$url.'/smpedit">Simple Problem Editor</a> - Note: it can take up to 10 minutes for changes to take effect for all users.</td></tr></table><br />';
       }
       return $result;
   }
   
   sub end_simpleeditbutton {
       return '';
   }
   
 1;  1;
 __END__  __END__

Removed from v.1.187  
changed lines
  Added in v.1.195


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