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

Diff for /loncom/homework/inputtags.pm between versions 1.231 and 1.233

version 1.231, 2007/09/26 19:30:30 version 1.233, 2007/10/17 00:22:51
Line 539  sub valid_award { Line 539  sub valid_award {
     $i=0;      $i=0;
     my %rev_awards = map { ($_,$i++) } @awards;      my %rev_awards = map { ($_,$i++) } @awards;
   
   sub awarddetail_to_awarded {
       my ($awarddetail) = @_;
       if ($awarddetail eq 'EXACT_ANS'
    || $awarddetail eq 'APPROX_ANS') {
    return 1;
       }
       return 0;
   }
   
   sub hide_award {
       my ($award) = @_;
       if (&Apache::lonhomework::show_no_problem_status()) {
    return 1;
       }
       if ($award =~
    /^(?:EXACT_ANS|APPROX_ANS|SUBMITTED|ASSIGNED_SCORE|INCORRECT)/) {
    return 1;
       }
       return 0;
   }
   
 sub finalizeawards {  sub finalizeawards {
     my ($awardref,$msgref,$nameref,$reverse)=@_;      my ($awardref,$msgref,$nameref,$reverse,$final_scantron)=@_;
     my $result;      my $result;
     if ($#$awardref == -1) { $result = "NO_RESPONSE"; }      if ($#$awardref == -1) { $result = "NO_RESPONSE"; }
     if ($result eq '' ) {      if ($result eq '' ) {
Line 551  sub finalizeawards { Line 572  sub finalizeawards {
  $blankcount++;   $blankcount++;
     }      }
  }   }
  if ($blankcount == ($#$awardref + 1)) { $result = 'NO_RESPONSE'; }   if ($blankcount == ($#$awardref + 1)) {
       return ('NO_RESPONSE');
    }
     }      }
     if (defined($result)) { return ($result); }      if (!$final_scantron && defined($result)) { return ($result); }
   
       # if in scantron mode, if the award for any response is 
       # assigned score, then the part gets an assigned score
       if ($final_scantron 
    && grep {$_ eq 'ASSIGNED_SCORE'} (@$awardref)) {
    return ('ASSIGNED_SCORE');
       }
   
       # if in scantron mode, if the award for any response is 
       # correct and there are non-correct responses,
       # then the part gets an assigned score
       if ($final_scantron 
    && (grep { $_ eq 'EXACT_ANS' ||
      $_ eq 'APPROX_ANS'  } (@$awardref))
    && (grep { $_ ne 'EXACT_ANS' &&
      $_ ne 'APPROX_ANS'  } (@$awardref))) {
    return ('ASSIGNED_SCORE');
       }
     # these awards are ordered from most important error through best correct      # these awards are ordered from most important error through best correct
     my $awards = (!$reverse) ? \%fwd_awards : \%rev_awards ;      my $awards = (!$reverse) ? \%fwd_awards : \%rev_awards ;
   
Line 568  sub finalizeawards { Line 608  sub finalizeawards {
  }   }
  $j++;   $j++;
     }      }
   
     if (defined($which)) {      if (defined($which)) {
  if (ref($nameref)) {   if (ref($nameref)) {
     return ($$awardref[$which],$$msgref[$which],$$nameref[$which]);      return ($$awardref[$which],$$msgref[$which],$$nameref[$which]);
Line 786  sub decideoutput { Line 827  sub decideoutput {
  }   }
     }      }
   
     if (lc($Apache::lonhomework::problemstatus) eq 'no'  &&       if (&Apache::lonhomework::hide_problem_status()
  $Apache::inputtags::status[-1] ne 'SHOW_ANSWER') {   && $Apache::inputtags::status[-1] ne 'SHOW_ANSWER'
    && &hide_award($award)) {
  $message = &mt("Answer Submitted: Your final submission will be graded after the due date.");   $message = &mt("Answer Submitted: Your final submission will be graded after the due date.");
  $css_class=$possible_class{'no_grade'};   $css_class=$possible_class{'no_grade'};
  $button=1;   $button=1;
Line 850  sub setgradedata { Line 892  sub setgradedata {
  $Apache::lonhomework::results{"resource.$id.afterduedate"}=$award;   $Apache::lonhomework::results{"resource.$id.afterduedate"}=$award;
  return '';   return '';
     } elsif ( $Apache::lonhomework::history{"resource.$id.solved"} !~      } elsif ( $Apache::lonhomework::history{"resource.$id.solved"} !~
       /^correct/ || $Apache::lonhomework::scantronmode ||        /^correct/ 
       lc($Apache::lonhomework::problemstatus) eq 'no') {        || $Apache::lonhomework::scantronmode 
         || &Apache::lonhomework::hide_problem_status()  ) {
         # the student doesn't already have it correct,          # the student doesn't already have it correct,
  # or we are in a mode (scantron orno problem status) where a correct    # or we are in a mode (scantron orno problem status) where a correct 
         # can become incorrect          # can become incorrect
Line 873  sub setgradedata { Line 916  sub setgradedata {
     my $numawards=scalar(@Apache::inputtags::response);      my $numawards=scalar(@Apache::inputtags::response);
     $Apache::lonhomework::results{"resource.$id.awarded"} = 0;      $Apache::lonhomework::results{"resource.$id.awarded"} = 0;
     foreach my $res (@Apache::inputtags::response) {      foreach my $res (@Apache::inputtags::response) {
  $Apache::lonhomework::results{"resource.$id.awarded"}+=   if (defined($Apache::lonhomework::results{"resource.$id.$res.awarded"})) {
     $Apache::lonhomework::results{"resource.$id.$res.awarded"};      $Apache::lonhomework::results{"resource.$id.awarded"}+=
    $Apache::lonhomework::results{"resource.$id.$res.awarded"};
    } else {
       $Apache::lonhomework::results{"resource.$id.awarded"}+=
    &awarddetail_to_awarded($Apache::lonhomework::results{"resource.$id.$res.awarddetail"});
    }
     }      }
     if ($numawards > 0) {      if ($numawards > 0) {
  $Apache::lonhomework::results{"resource.$id.awarded"}/=   $Apache::lonhomework::results{"resource.$id.awarded"}/=
Line 889  sub setgradedata { Line 937  sub setgradedata {
  } elsif ( $award eq 'INCORRECT' ) {   } elsif ( $award eq 'INCORRECT' ) {
     $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;
     if (lc($Apache::lonhomework::problemstatus) eq 'no' ||      if (&Apache::lonhomework::hide_problem_status()
  $Apache::lonhomework::scantronmode) {   || $Apache::lonhomework::scantronmode) {
  $Apache::lonhomework::results{"resource.$id.awarded"} = 0;   $Apache::lonhomework::results{"resource.$id.awarded"} = 0;
     }      }
     $Apache::lonhomework::results{"resource.$id.solved"} =      $Apache::lonhomework::results{"resource.$id.solved"} =
Line 909  sub setgradedata { Line 957  sub setgradedata {
  } else {   } else {
     $Apache::lonhomework::results{"resource.$id.solved"} =      $Apache::lonhomework::results{"resource.$id.solved"} =
  'incorrect_attempted';   'incorrect_attempted';
     if (lc($Apache::lonhomework::problemstatus) eq 'no' ||      if (&Apache::lonhomework::show_no_problem_status()
  $Apache::lonhomework::scantronmode) {   || $Apache::lonhomework::scantronmode) {
  $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;
  $Apache::lonhomework::results{"resource.$id.awarded"} = 0;   $Apache::lonhomework::results{"resource.$id.awarded"} = 0;
     }      }
   
       if (&Apache::lonhomework::show_some_problem_status()) {
    # clear out the awarded if they had gotten it wrong/right
    # and are now in an error mode
    $Apache::lonhomework::results{"resource.$id.awarded"} = '';
       }
  }   }
  if (defined($msg)) {   if (defined($msg)) {
     $Apache::lonhomework::results{"resource.$id.awardmsg"} = $msg;      $Apache::lonhomework::results{"resource.$id.awardmsg"} = $msg;
Line 928  sub setgradedata { Line 982  sub setgradedata {
     # check if this was a previous submission if it was delete the      # check if this was a previous submission if it was delete the
     # unneeded data and update the previously_used attribute      # unneeded data and update the previously_used attribute
     if ( $previously_used eq 'PREVIOUSLY_USED') {      if ( $previously_used eq 'PREVIOUSLY_USED') {
  if (lc($Apache::lonhomework::problemstatus) ne 'no') {   if (&Apache::lonhomework::show_problem_status()) {
     delete($Apache::lonhomework::results{"resource.$id.tries"});      delete($Apache::lonhomework::results{"resource.$id.tries"});
     $Apache::lonhomework::results{"resource.$id.previous"} = '1';      $Apache::lonhomework::results{"resource.$id.previous"} = '1';
  }   }
Line 1006  sub grade { Line 1060  sub grade {
     &Apache::lonxml::debug("got message $value from $response for $id");      &Apache::lonxml::debug("got message $value from $response for $id");
     push (@msgs,$value);      push (@msgs,$value);
  }   }
  my ($finalaward,$msg) = &finalizeawards(\@awards,\@msgs);   my ($finalaward,$msg) = 
       &finalizeawards(\@awards,\@msgs,undef,undef,
       $Apache::lonhomework::scantronmode);
  my $previously_used;   my $previously_used;
  if ( $#Apache::inputtags::previous eq $#awards ) {   if ( $#Apache::inputtags::previous eq $#awards ) {
     my ($match) =      my ($match) =
Line 1185  sub previous_tries { Line 1241  sub previous_tries {
     my $previous = $count_lookup{$which};      my $previous = $count_lookup{$which};
     $message =~ s{(</td>)}{ as submission \# $previous $1};      $message =~ s{(</td>)}{ as submission \# $previous $1};
  } elsif ($Apache::lonhomework::history{"$prefix.tries"}) {   } elsif ($Apache::lonhomework::history{"$prefix.tries"}) {
     if (!(lc($Apache::lonhomework::problemstatus) eq 'no'      if (!(&Apache::lonhomework::hide_problem_status()
   && $Apache::inputtags::status[-1] ne 'SHOW_ANSWER')    && $Apache::inputtags::status[-1] ne 'SHOW_ANSWER')
  && $Apache::lonhomework::history{"$prefix.solved"} =~/^correct/   && $Apache::lonhomework::history{"$prefix.solved"} =~/^correct/
  ) {   ) {
Removed from v.1.231  
changed lines
  Added in v.1.233

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