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

Diff for /loncom/homework/inputtags.pm between versions 1.52 and 1.54

version 1.52, 2002/01/30 17:32:42 version 1.54, 2002/03/08 19:55:00
Line 185  sub finalizeawards { Line 185  sub finalizeawards {
   my $award;    my $award;
   if ($#_ == '-1') { $result = "NO_RESPONSE"; }    if ($#_ == '-1') { $result = "NO_RESPONSE"; }
   if ($result eq '' ) {    if ($result eq '' ) {
     foreach $award (@_) { if ($award eq '') {$result='MISSING_ANSWER'; last;}}      my $blankcount;
       foreach $award (@_) {
         if ($award eq '') {
    $result='MISSING_ANSWER';
    $blankcount++;
         }
       }
       if ($blankcount == ($#_ + 1)) { $result = 'NO_RESPONSE'; }
   }    }
   if ($result eq '' ) {    if ($result eq '' ) {
     foreach $award (@_) { if ($award eq 'ERROR') {$result='ERROR'; last;}}      foreach $award (@_) { if ($award eq 'ERROR') {$result='ERROR'; last;}}
Line 292  sub decideoutput { Line 299  sub decideoutput {
 sub setgradedata {  sub setgradedata {
   my ($award,$id,$previously_used) = @_;    my ($award,$id,$previously_used) = @_;
   # if the student already has it correct, don't modify the status    # if the student already has it correct, don't modify the status
   if ( $Apache::lonhomework::history{"resource.$id.solved"} !~    if ($Apache::inputtags::status['-1'] ne 'CAN_ANSWER') {
       $Apache::lonhomework::results{"resource.$id.afterduedate"}=$award;
       return '';
     } elsif ( $Apache::lonhomework::history{"resource.$id.solved"} !~
        /^correct/ ) {         /^correct/ ) {
     #handle assignment of tries and solved status      #handle assignment of tries and solved status
       if ($Apache::lonhomework::history{"resource.$id.afterduedate"}) {
         $Apache::lonhomework::results{"resource.$id.afterduedate"}='';
       }
     if ( $award eq 'APPROX_ANS' || $award eq 'EXACT_ANS' ) {      if ( $award eq 'APPROX_ANS' || $award eq 'EXACT_ANS' ) {
       $Apache::lonhomework::results{"resource.$id.tries"} =        $Apache::lonhomework::results{"resource.$id.tries"} =
  $Apache::lonhomework::history{"resource.$id.tries"} + 1;   $Apache::lonhomework::history{"resource.$id.tries"} + 1;
Line 349  sub grade { Line 362  sub grade {
     foreach $response (@Apache::inputtags::responselist) {      foreach $response (@Apache::inputtags::responselist) {
       &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 '' ) {        &Apache::lonxml::debug("keeping $value from $response for $id");
  &Apache::lonxml::debug("keeping $value from $response for $id");        push (@awards,$value);
  push (@awards,$value);  
       } else {  
  &Apache::lonxml::debug("skipping $value from $response for $id");  
       }  
     }      }
     my $finalaward = &finalizeawards(@awards);      my $finalaward = &finalizeawards(@awards);
     my $previously_used;      my $previously_used;
Line 377  sub gradestatus { Line 386  sub gradestatus {
   my ($id) = @_;    my ($id) = @_;
   my $showbutton = 1;    my $showbutton = 1;
   my $message = '';    my $message = '';
     my $latemessage = '';
   my $trystr='';    my $trystr='';
   my $button='';    my $button='';
   my $previousmsg='';    my $previousmsg='';
Line 410  sub gradestatus { Line 420  sub gradestatus {
     if ( $showbutton ) {       if ( $showbutton ) { 
       $button = '<br /><input type="submit" name="submit" value="Submit Answer" />';        $button = '<br /><input type="submit" name="submit" value="Submit Answer" />';
     }      }
       if ($Apache::lonhomework::history{"resource.$id.afterduedate"}) {
         #last submissions was after due date
         $latemessage="<td bgcolor=\"#ffaaaa\">The last submission was after the Due Date</td>";
       }
   }    }
   my $output= $previousmsg.$message.$trystr;    my $output= $previousmsg.$latemessage.$message.$trystr;
   if ($output =~ /^\s*$/) {    if ($output =~ /^\s*$/) {
     return $button;      return $button;
   } else {    } else {
     return $button.'<table><tr>'.$previousmsg.$message.$trystr.'</tr></table>';      return $button.'<table><tr>'.$output.'</tr></table>';
   }    }
 }  }
 1;  1;
Removed from v.1.52  
changed lines
  Added in v.1.54

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