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

Diff for /loncom/homework/inputtags.pm between versions 1.11 and 1.12

version 1.11, 2000/12/04 22:08:57 version 1.12, 2000/12/05 22:07:26
Line 113  sub finalizeawards { Line 113  sub finalizeawards {
       }        }
     }      }
   }    }
   &Apache::lonxml::debug("1 $result");  
   if ($result eq '' ) {    if ($result eq '' ) {
     foreach $award (@_) {       foreach $award (@_) { 
       if ($award eq 'WANTED_NUMERIC' ||         if ($award eq 'WANTED_NUMERIC' || 
   $award eq 'BAD_FORMULA') {$result=$award; last;}    $award eq 'BAD_FORMULA') {$result=$award; last;}
     }      }
   }    }
   &Apache::lonxml::debug("2 $result");  
   if ($result eq '' ) {    if ($result eq '' ) {
     foreach $award (@_) { if ($award eq 'SIG_FAIL') {$result=$award; last;} }      foreach $award (@_) { if ($award eq 'SIG_FAIL') {$result=$award; last;} }
   }    }
   &Apache::lonxml::debug("3 $result");  
   if ($result eq '' ) {    if ($result eq '' ) {
     foreach $award (@_) { if ($award eq 'INCORRECT') {$result=$award; last;} }      foreach $award (@_) { if ($award eq 'INCORRECT') {$result=$award; last;} }
   }    }
   &Apache::lonxml::debug("4 $result");  
   if ($result eq '' ) {    if ($result eq '' ) {
     foreach $award (@_) { if ($award eq 'APPROX_ANS') {$result=$award; last;} }      foreach $award (@_) { if ($award eq 'APPROX_ANS') {$result=$award; last;} }
   }    }
   &Apache::lonxml::debug("5 $result");  
   if ($result eq '' ) { $result='EXACT_ANS'; }    if ($result eq '' ) { $result='EXACT_ANS'; }
   &Apache::lonxml::debug("6 $result");  
   return $result    return $result
 }  }
   
Line 142  sub decideoutput { Line 136  sub decideoutput {
   my ($award)=@_;    my ($award)=@_;
   my $message='';    my $message='';
   my $button=0;    my $button=0;
   my $tries=0;  
   if      ($award eq 'EXACT_ANS' || $award eq 'APPROX_ANS' ) {    if      ($award eq 'EXACT_ANS' || $award eq 'APPROX_ANS' ) {
     $message = "Yes, Computer gets: ";      $message = "Correct computer gets %s";
     $tries=1; $button=0;      $button=0;
       
   } elsif ($award eq 'WANTED_NUMERIC') {    } elsif ($award eq 'WANTED_NUMERIC') {
     $message = "This question expects a numeric answer";      $message = "This question expects a numeric answer";
     $tries=0; $button=1;      $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";
     $tries=0; $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, Computer reads units as %s";
     $tries=0; $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";
     $tries=0; $button=1;      $button=1;
   } elsif ($award eq 'NO_UNIT') {    } elsif ($award eq 'NO_UNIT') {
     $message = "Units required";      $message = "Units required";
     $tries=0; $button=1;      $button=1;
   } elsif ($award eq 'BAD_FORMULA') {    } elsif ($award eq 'BAD_FORMULA') {
     $message = "Unable to understand formula";      $message = "Unable to understand formula";
     $tries=0; $button=1;      $button=1;
   } elsif ($award eq 'INCORRECT') {    } elsif ($award eq 'INCORRECT') {
     $message = "Incorrect";      $message = "Incorrect";
     $tries=0; $button=1;      $button=1;
   } else {    } else {
     $message = "Unknown message: $award";      $message = "Unknown message: $award";
     $tries=0; $button=1;      $button=1;
   }    }
   return ($tries,$button,$message);    return ($button,$message);
   }
   
   sub setgradedata {
     my ($award,$id) = @_;
     if ( $award eq 'APPROX_ANS' || $award eq 'EXACT_ANS' ) {
       $Apache::lonhomework::results{"resource.tries.$id"} =
         $Apache::lonhomework::history{"resource.tries.$id"} + 1;
       $Apache::lonhomework::results{"resource.solved.$id"} =
         'correct_by_student';
       $Apache::lonhomework::results{"resource.awarded.$id"} = '1';
     } elsif ( $award eq 'INCORRECT' ) {
       $Apache::lonhomework::results{"resource.tries.$id"} =
         $Apache::lonhomework::history{"resource.tries.$id"} + 1;
       $Apache::lonhomework::results{"resource.solved.$id"} =
         'incorrect_attempted';
     } else {
       $Apache::lonhomework::results{"resource.solved.$id"} =
         'incorrect_attempted';
     }
     $Apache::lonhomework::results{"resource.award.$id"} = $award;
 }  }
   
 sub grade {  sub grade {
Line 195  sub grade { Line 207  sub grade {
  }   }
       }        }
       my $finalaward = &finalizeawards(@awards);        my $finalaward = &finalizeawards(@awards);
       my ($triesinc,$showbutton,$message) = &decideoutput($finalaward);  
       $Apache::lonhomework::results{"resource.tries.$id"} =  
  $Apache::lonhomework::history{"resource.tries.$id"} + 1;  
       &Apache::lonxml::debug("final award $finalaward");        &Apache::lonxml::debug("final award $finalaward");
       #if ($showbutton > 0) { $result.=$button }        &setgradedata($finalaward,$id);
     }      }
   }    }
   return $result;    return $result;
 }  }
   
 sub gradestatus {  sub gradestatus {
   my $button='<input type="submit" name="submit" value="Submit All Answers">';    my ($id) = @_;
   return 'Grade Status is Unknown'.$button;    my $showbutton = 1;
     my $message = '';
     my $award = $Apache::lonhomework::history{"resource.award.$id"};
     &Apache::lonxml::debug("Found Award |$award|");
     if ( $award ne '' ) {
       &Apache::lonxml::debug('Getting message');
       ($showbutton,$message) = &decideoutput($award);
     }
     my $button='';
     my $tries = $Apache::lonhomework::history{"resource.tries.$id"};
     my $maxtries = $Apache::lonhomework::history{"resource.maxtries.$id"};
     if ( $tries eq '' ) { $tries = '0'; }
     if ( $maxtries eq '' ) { $maxtries = '99'; } 
     if ( $tries >= $maxtries ) { $showbutton = 0; }
     my $trystr = "Tries $tries/$maxtries";
     if ( $showbutton ) { 
       $button = '<input type="submit" name="submit" value="Submit All Answers"><br></br>';
     }
     return $button.$message.$trystr;
 }  }
 1;  1;
 __END__  __END__
Removed from v.1.11  
changed lines
  Added in v.1.12

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