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

Diff for /loncom/homework/inputtags.pm between versions 1.74 and 1.84

version 1.74, 2002/11/19 14:59:35 version 1.84, 2003/02/07 22:03:21
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 47  sub initialize_inputtags { Line 48  sub initialize_inputtags {
   @Apache::inputtags::responselist=();    @Apache::inputtags::responselist=();
   # list of whether or not a specific response was previously used    # list of whether or not a specific response was previously used
   @Apache::inputtags::previous=();    @Apache::inputtags::previous=();
     # submission it was used in
     @Apache::inputtags::previous_version=();
   # id of current part, 0 means that no part is current (inside <problem> only    # id of current part, 0 means that no part is current (inside <problem> only
   $Apache::inputtags::part='';    $Apache::inputtags::part='';
   # list of problem date statuses, the first element is for <problem>    # list of problem date statuses, the first element is for <problem>
Line 90  sub start_textfield { Line 93  sub start_textfield {
     "rows=\"$rows\" cols=\"$cols\">".$oldresponse;      "rows=\"$rows\" cols=\"$cols\">".$oldresponse;
  if ($oldresponse ne '') {   if ($oldresponse ne '') {
     #get rid of any startup text if the user has already responded      #get rid of any startup text if the user has already responded
     &Apache::lonxml::get_all_text("/textfield",$$parser[-1]);      &Apache::lonxml::get_all_text("/textfield",$parser);
  }   }
     } else {      } else {
  #right or wrong don't show it   #right or wrong don't show it
  #$result='<table border="1"><tr><td><i>'.$oldresponse.'</i></td></tr></table>';   #$result='<table border="1"><tr><td><i>'.$oldresponse.'</i></td></tr></table>';
  $result='';   $result='';
  #get rid of any startup text   #get rid of any startup text
  &Apache::lonxml::get_all_text("/textfield",$$parser[-1]);   &Apache::lonxml::get_all_text("/textfield",$parser);
     }      }
   } elsif ($target eq 'grade') {    } elsif ($target eq 'grade') {
     my $seedtext=&Apache::lonxml::get_all_text("/textfield",$$parser[-1]);      my $seedtext=&Apache::lonxml::get_all_text("/textfield",$parser);
     if ($seedtext eq $ENV{'form.HWVAL'.$resid}) {      if ($seedtext eq $ENV{'form.HWVAL'.$resid}) {
       # if the seed text is still there it wasn't a real submission        # if the seed text is still there it wasn't a real submission
       $ENV{'form.HWVAL'.$resid}='';        $ENV{'form.HWVAL'.$resid}='';
Line 109  sub start_textfield { Line 112  sub start_textfield {
     $result.=&Apache::edit::tag_start($target,$token);      $result.=&Apache::edit::tag_start($target,$token);
     $result.=&Apache::edit::text_arg('Rows:','rows',$token,4);      $result.=&Apache::edit::text_arg('Rows:','rows',$token,4);
     $result.=&Apache::edit::text_arg('Columns:','cols',$token,4);      $result.=&Apache::edit::text_arg('Columns:','cols',$token,4);
     my $bodytext=&Apache::lonxml::get_all_text("/textfield",$$parser[-1]);      my $bodytext=&Apache::lonxml::get_all_text("/textfield",$parser);
     $result.=&Apache::edit::editfield($token->[1],$bodytext,'Text you want to appear by default:',80,2);      $result.=&Apache::edit::editfield($token->[1],$bodytext,'Text you want to appear by default:',80,2);
   } elsif ($target eq 'modified') {    } elsif ($target eq 'modified') {
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,      my $constructtag=&Apache::edit::get_new_args($token,$parstack,
Line 120  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 169  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') {
       $result='\framebox[1cm][s]{\hfill}';        my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval);
         if ($size != 0) {$size=$size*2; $size.=' mm';} else {$size='40 mm';}
         $result='\framebox['.$size.'][s]{\tiny\strut}';
   }    }
   return $result;    return $result;
 }  }
Line 228  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 281  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 388  sub grade { Line 415  sub grade {
     my $finalaward = &finalizeawards(@awards);      my $finalaward = &finalizeawards(@awards);
     my $previously_used;      my $previously_used;
     if ( $#Apache::inputtags::previous eq $#awards ) {      if ( $#Apache::inputtags::previous eq $#awards ) {
       $previously_used = 'PREVIOUSLY_LAST';   my $match=0;
       foreach my $value (@Apache::inputtags::previous) {   my @matches;
  if ($value eq 'PREVIOUSLY_USED' ) {   foreach my $versionar (@Apache::inputtags::previous_version) {
   $previously_used = $value;      foreach my $version (@$versionar) {
   last;   $matches[$version]++;
       }
    }
    foreach my $elem (@matches) {if ($elem eq ($#awards+1)) {$match=1;}}
    if ($match) {
       $previously_used = 'PREVIOUSLY_LAST';
       foreach my $value (@Apache::inputtags::previous) {
    if ($value eq 'PREVIOUSLY_USED' ) {
       $previously_used = $value;
       last;
    }
       }
  }   }
       }  
     }      }
     &Apache::lonxml::debug("final award $finalaward, $previously_used");      &Apache::lonxml::debug("final award $finalaward, $previously_used");
     &setgradedata($finalaward,$id,$previously_used);      &setgradedata($finalaward,$id,$previously_used);
Line 413  sub gradestatus { Line 450  sub gradestatus {
   
   my $status = $Apache::inputtags::status['-1'];    my $status = $Apache::inputtags::status['-1'];
   &Apache::lonxml::debug("gradestatus has :$status:");    &Apache::lonxml::debug("gradestatus has :$status:");
   if ( $status ne 'CLOSED' ) {      if ( $status ne 'CLOSED' && $status ne 'UNAVAILABLE') {  
     my $award = $Apache::lonhomework::history{"resource.$id.award"};      my $award = $Apache::lonhomework::history{"resource.$id.award"};
     my $solved = $Apache::lonhomework::history{"resource.$id.solved"};      my $solved = $Apache::lonhomework::history{"resource.$id.solved"};
     my $previous = $Apache::lonhomework::history{"resource.$id.previous"};      my $previous = $Apache::lonhomework::history{"resource.$id.previous"};
Line 441  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.74  
changed lines
  Added in v.1.84

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