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

version 1.29, 2001/03/21 18:24:36 version 1.30, 2001/04/05 00:09:19
Line 41  sub start_textarea { Line 41  sub start_textarea {
   my $result = "";    my $result = "";
   my $id = &start_input($parstack,$safeeval);    my $id = &start_input($parstack,$safeeval);
   if ($target eq 'web') {    if ($target eq 'web') {
     $result= '<textarea name="HWVAL'.$id.'" value="">';      my $oldresponse = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.$Apache::inputtags::response['-1'].submission"};
       $result= '<textarea name="HWVAL'.$Apache::inputtags::response['-1'].'">'.$oldresponse;
       if ($oldresponse ne '') {
         #get rid of any startup text if the user has already responded
         &Apache::lonxml::get_all_text("/textarea",$$parser[$#$parser]);
       }
   }    }
   return $result;    return $result;
 }  }
Line 156  sub finalizeawards { Line 161  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 'SUBMITTED') {$result=$award; last;} }
     }
     if ($result eq '' ) {
     foreach $award (@_) { if ($award eq 'APPROX_ANS') {$result=$award; last;} }      foreach $award (@_) { if ($award eq 'APPROX_ANS') {$result=$award; last;} }
   }    }
   if ($result eq '' ) { $result='EXACT_ANS'; }    if ($result eq '' ) { $result='EXACT_ANS'; }
Line 196  sub decideoutput { Line 204  sub decideoutput {
   } elsif ($award eq 'INCORRECT') {    } elsif ($award eq 'INCORRECT') {
     $message = "Incorrect";      $message = "Incorrect";
     $button=1;      $button=1;
     } elsif ($award eq 'SUBMITTED') {
       $message = "Your submission has been recorded.";
       $button=1;
   } else {    } else {
     $message = "Unknown message: $award";      $message = "Unknown message: $award";
     $button=1;      $button=1;
Line 216  sub setgradedata { Line 227  sub setgradedata {
       $Apache::lonhomework::history{"resource.$id.tries"} + 1;        $Apache::lonhomework::history{"resource.$id.tries"} + 1;
     $Apache::lonhomework::results{"resource.$id.solved"} =      $Apache::lonhomework::results{"resource.$id.solved"} =
       'incorrect_attempted';        'incorrect_attempted';
     } elsif ( $award eq 'SUBMITTED' ) {
       $Apache::lonhomework::results{"resource.$id.tries"} =
         $Apache::lonhomework::history{"resource.$id.tries"} + 1;
       $Apache::lonhomework::results{"resource.$id.solved"} =
         'ungraded_attempted';
   } else {    } else {
     $Apache::lonhomework::results{"resource.$id.solved"} =      $Apache::lonhomework::results{"resource.$id.solved"} =
       'incorrect_attempted';        'incorrect_attempted';
Line 236  sub grade { Line 252  sub grade {
  &Apache::lonxml::debug("looking for response.$id.$response.awarddetail");   &Apache::lonxml::debug("looking for response.$id.$response.awarddetail");
  my $value=$Apache::lonhomework::results{"resource.$id.$response.awarddetail"};   my $value=$Apache::lonhomework::results{"resource.$id.$response.awarddetail"};
  if ( $value ne '' ) {   if ( $value ne '' ) {
   &Apache::lonxml::debug("keep ing $value from $response for $id");    &Apache::lonxml::debug("keeping $value from $response for $id");
   push (@awards,$value);    push (@awards,$value);
  } else {   } else {
   &Apache::lonxml::debug("skipping $value from $response for $id");    &Apache::lonxml::debug("skipping $value from $response for $id");

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


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