Diff for /loncom/homework/inputtags.pm between versions 1.77 and 1.83

version 1.77, 2002/12/05 22:59:37 version 1.83, 2003/01/27 17:30:27
Line 30 Line 30
 package Apache::inputtags;  package Apache::inputtags;
 use HTML::Entities();  use HTML::Entities();
 use strict;  use strict;
   use Apache::loncommon;
   
 BEGIN {  BEGIN {
   &Apache::lonxml::register('Apache::inputtags',('textfield','textline'));    &Apache::lonxml::register('Apache::inputtags',('textfield','textline'));
Line 122  sub start_textfield { Line 123  sub start_textfield {
       $result=$token->[4];        $result=$token->[4];
     }      }
     $result.=&Apache::edit::modifiedfield();      $result.=&Apache::edit::modifiedfield();
     } elsif ($target eq 'tex') {
         if ($$tagstack[-2] eq 'essayresponse' and $Apache::lonhomework::type eq 'exam') {
     my $number_of_lines= &Apache::lonxml::get_param('rows',$parstack,$safeeval);
     $result = '\fbox{\fbox{\parbox{\textwidth-5mm}{';
    for (my $i=0;$i<int $number_of_lines*2;$i++) {$result.='\strut \\\\ ';}
    $result.='\strut \\\\\strut \\\\\strut \\\\\strut \\\\}}}';
         }
   }    }
   return $result;    return $result;
 }  }
Line 171  sub start_textline { Line 179  sub start_textline {
   } elsif ($target eq 'modified') {    } elsif ($target eq 'modified') {
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'size');      my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'size');
     if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }      if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
   } elsif ($target eq 'tex') {    } elsif ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') {
       my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval);        my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval);
       if ($size != 0) {$size=$size*2; $size.=' mm';} else {$size='40 mm';}        if ($size != 0) {$size=$size*2; $size.=' mm';} else {$size='40 mm';}
       $result='\framebox['.$size.'][s]{\tiny\strut}';        $result='\framebox['.$size.'][s]{\tiny\strut}';
Line 232  sub finalizeawards { Line 240  sub finalizeawards {
     foreach $award (@_) { if ($award eq 'INCORRECT') {$result=$award; last;} }      foreach $award (@_) { if ($award eq 'INCORRECT') {$result=$award; last;} }
   }    }
   if ($result eq '' ) {    if ($result eq '' ) {
         foreach $award (@_) { if ($award eq 'MISORDERED_RANK') {$result=$award; last;} }
     }
     if ($result eq '' ) {
         foreach $award (@_) { if ($award eq 'INVALID_FILETYPE') {$result=$award; last;} }
     }
     if ($result eq '' ) {
     foreach $award (@_) { if ($award eq 'DRAFT') {$result=$award; last;} }      foreach $award (@_) { if ($award eq 'DRAFT') {$result=$award; last;} }
   }    }
   if ($result eq '' ) {    if ($result eq '' ) {
Line 285  sub decideoutput { Line 299  sub decideoutput {
   } elsif ($award eq 'WANTED_NUMERIC') {    } elsif ($award eq 'WANTED_NUMERIC') {
     $message = "This question expects a numeric answer";      $message = "This question expects a numeric answer";
     $button=1;      $button=1;
     } elsif ($award eq 'MISORDERED_RANK') {
       $message = 'You have provided an invalid ranking, please refer to '.
        &Apache::loncommon::help_open_topic('Ranking_Problems','help on ranking problems').'.';
       $button=1;
     } elsif ($award eq 'INVALID_FILETYPE') {
       $message = 'The filetype extension of the file you uploaded is not allowed.';
       $button=1;
   } elsif ($award eq 'SIG_FAIL') {    } elsif ($award eq 'SIG_FAIL') {
     $message = "Please adjust significant figures.";# you provided %s significant figures";      $message = "Please adjust significant figures.";# you provided %s significant figures";
     $button=1;      $button=1;
   } elsif ($award eq 'UNIT_FAIL') {    } elsif ($award eq 'UNIT_FAIL') {
     $message = "Units incorrect."; #Computer reads units as %s";      $message = "Units incorrect. ".
          &Apache::loncommon::help_open_topic('Physical_Units'); #Computer reads units as %s";
     $button=1;      $button=1;
   } elsif ($award eq 'UNIT_NOTNEEDED') {    } elsif ($award eq 'UNIT_NOTNEEDED') {
     $message = "Only a number required.";# Computer reads units of %s";      $message = "Only a number required.";# Computer reads units of %s";
     $button=1;      $button=1;
   } elsif ($award eq 'NO_UNIT') {    } elsif ($award eq 'NO_UNIT') {
     $message = "Units required";      $message = "Units required".
          &Apache::loncommon::help_open_topic('Physical_Units');
     $button=1;      $button=1;
   } elsif ($award eq 'BAD_FORMULA') {    } elsif ($award eq 'BAD_FORMULA') {
     $message = "Unable to understand formula";      $message = "Unable to understand formula";
Line 455  sub gradestatus { Line 478  sub gradestatus {
       if ($target eq 'tex') {        if ($target eq 'tex') {
   if ($ENV{'request.state'} ne "construct") {    if ($ENV{'request.state'} ne "construct") {
       $trystr = ' {\small \textit{Tries} '.$tries.'/'.$maxtries.'} \vskip 0 mm ';        $trystr = ' {\small \textit{Tries} '.$tries.'/'.$maxtries.'} \vskip 0 mm ';
     } else {
         $trystr = '\vskip 0 mm ';
   }    }
       } else {        } else {
          $trystr = "<td>Tries $tries/$maxtries</td>";           $trystr = "<td>Tries $tries/$maxtries</td>";

Removed from v.1.77  
changed lines
  Added in v.1.83


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