Diff for /loncom/homework/inputtags.pm between versions 1.30 and 1.33

version 1.30, 2001/04/05 00:09:19 version 1.33, 2001/05/19 00:23:38
Line 11  sub BEGIN { Line 11  sub BEGIN {
   
   
 sub initialize_inputtags {  sub initialize_inputtags {
     # list of current input ids
   @Apache::inputtags::input=();    @Apache::inputtags::input=();
     # list of all input ids seen in this problem
   @Apache::inputtags::inputlist=();    @Apache::inputtags::inputlist=();
     # list of all current response ids
   @Apache::inputtags::response=();    @Apache::inputtags::response=();
     #list of all response ids seen in this problem
   @Apache::inputtags::responselist=();    @Apache::inputtags::responselist=();
   @Apache::inputtags::answergroup=();    # 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> 
     #if there is a second element it is for the current <part>
   @Apache::inputtags::status=();    @Apache::inputtags::status=();
     #hash of defined params for the current response
   %Apache::inputtags::params=();    %Apache::inputtags::params=();
 }  }
   
Line 42  sub start_textarea { Line 49  sub start_textarea {
   my $id = &start_input($parstack,$safeeval);    my $id = &start_input($parstack,$safeeval);
   if ($target eq 'web') {    if ($target eq 'web') {
     my $oldresponse = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.$Apache::inputtags::response['-1'].submission"};      my $oldresponse = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.$Apache::inputtags::response['-1'].submission"};
     $result= '<textarea name="HWVAL'.$Apache::inputtags::response['-1'].'">'.$oldresponse;      my $args ='';
       if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
       my $cols = &Apache::run::run("{$args;".'return $cols}',$safeeval);
       if ( $cols eq '') { $cols = 80; }
       my $rows = &Apache::run::run("{$args;".'return $rows}',$safeeval);
       if ( $rows eq '') { $rows = 10; }
       $result= '<textarea name="HWVAL'.$Apache::inputtags::response['-1'].'" '.
         "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("/textarea",$$parser[$#$parser]);        &Apache::lonxml::get_all_text("/textarea",$$parser[$#$parser]);
Line 171  sub finalizeawards { Line 185  sub finalizeawards {
 }  }
   
 sub decideoutput {  sub decideoutput {
   my ($award)=@_;    my ($award,$solved)=@_;
   my $message='';    my $message='';
   my $button=0;    my $button=0;
   if      ($award eq 'EXACT_ANS' || $award eq 'APPROX_ANS' ) {    if      ($solved =~ /^correct/ || $award eq 'EXACT_ANS' || $award eq 'APPROX_ANS' ) {
     $message = "<b>You are correct.</b> Your receipt is ".&Apache::lonnet::receipt;      $message = "<b>You are correct.</b> Your receipt is ".&Apache::lonnet::receipt;
     $button=0;      $button=0;
   } elsif ($award eq 'NO_RESPONSE') {    } elsif ($award eq 'NO_RESPONSE') {
Line 277  sub gradestatus { Line 291  sub gradestatus {
   &Apache::lonxml::debug("gradestatus has :$status:");    &Apache::lonxml::debug("gradestatus has :$status:");
   if ( $status ne 'CLOSED' ) {      if ( $status ne 'CLOSED' ) {  
     my $award = $Apache::lonhomework::history{"resource.$id.award"};      my $award = $Apache::lonhomework::history{"resource.$id.award"};
     &Apache::lonxml::debug("Found Award |$award|");      my $solved = $Apache::lonhomework::history{"resource.$id.solved"};
       &Apache::lonxml::debug("Found Award |$award|$solved|");
     if ( $award ne '' ) {      if ( $award ne '' ) {
       &Apache::lonxml::debug('Getting message');        &Apache::lonxml::debug('Getting message');
       ($showbutton,$message) = &decideoutput($award);        ($showbutton,$message) = &decideoutput($award,$solved);
       $message="<br /><table bgcolor=\"#aaffaa\"><tr><td>$message</td></tr></table>";        $message="<br /><table bgcolor=\"#aaffaa\"><tr><td>$message</td></tr></table>";
     }      }
     my $tries = $Apache::lonhomework::history{"resource.$id.tries"};      my $tries = $Apache::lonhomework::history{"resource.$id.tries"};

Removed from v.1.30  
changed lines
  Added in v.1.33


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