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

Diff for /loncom/homework/inputtags.pm between versions 1.135 and 1.136

version 1.135, 2004/03/12 21:14:54 version 1.136, 2004/03/13 00:36:11
Line 277  sub end_hiddenline { Line 277  sub end_hiddenline {
     return "";      return "";
 }  }
   
   sub checkstatus {
       my ($value,$awardref,$msgref)=@_;
       for (my $i=0;$i<=$#$awardref;$i++) {
    if ($$awardref[$i] eq $value) {
       return ($$awardref[$i],$$msgref[$i]);
    }
       }
       return(undef,undef);
   }
   
 sub finalizeawards {  sub finalizeawards {
     my $result='';      my ($awardref,$msgref)=@_;
       my $result=undef;
     my $award;      my $award;
     if ($#_ == '-1') { $result = "NO_RESPONSE"; }      my $msg;
       if ($#$awardref == -1) { $result = "NO_RESPONSE"; }
     if ($result eq '' ) {      if ($result eq '' ) {
  my $blankcount;   my $blankcount;
  foreach $award (@_) {   foreach $award (@$awardref) {
     if ($award eq '') {      if ($award eq '') {
  $result='MISSING_ANSWER';   $result='MISSING_ANSWER';
  $blankcount++;   $blankcount++;
     }      }
  }   }
  if ($blankcount == ($#_ + 1)) { $result = 'NO_RESPONSE'; }   if ($blankcount == ($#$awardref + 1)) { $result = 'NO_RESPONSE'; }
     }  
     if ($result eq '' ) {  
  foreach $award (@_) { if ($award eq 'MISSING_ANSWER') {$result='MISSING_ANSWER'; last;}}  
     }  
     if ($result eq '' ) {  
  foreach $award (@_) { if ($award eq 'ERROR') {$result='ERROR'; last;}}  
     }  
     if ($result eq '' ) {  
  foreach $award (@_) { if ($award eq 'NO_RESPONSE') {$result='NO_RESPONSE'; last;} }  
     }  
     if ($result eq '' ) {  
  foreach $award (@_) { if ($award eq 'TOO_LONG') {$result='TOO_LONG'; last;}}  
     }  
     if ($result eq '' ) {  
  foreach $award (@_) {   
     if ($award eq 'UNIT_FAIL' ||  
  $award eq 'NO_UNIT' ||  
  $award eq 'UNIT_NOTNEEDED') {  
  $result=$award; last;  
     }  
  }  
     }  
     if ($result eq '' ) {  
  foreach $award (@_) {   
     if ($award eq 'WANTED_NUMERIC' ||   
  $award eq 'BAD_FORMULA') {$result=$award; last;}  
  }  
     }  
     if ($result eq '' ) {  
  foreach $award (@_) { if ($award eq 'SIG_FAIL') {$result=$award; last;} }  
     }  
     if ($result eq '' ) {  
  foreach $award (@_) { if ($award eq 'INCORRECT') {$result=$award; last;} }  
     }  
     if ($result eq '' ) {  
  foreach $award (@_) { if ($award eq 'MISORDERED_RANK') {$result=$award; last;} }  
     }  
     if ($result eq '' ) {  
  foreach $award (@_) { if ($award eq 'INVALID_FILETYPE') {$result=$award; last;} }  
     }      }
     if ($result eq '' ) {      if (defined($result)) { return ($result,$msg); }
  foreach $award (@_) { if ($award eq 'DRAFT') {$result=$award; last;} }      foreach my $possibleaward ('MISSING_ANSWER', 'ERROR', 'NO_RESPONSE',
     }         'TOO_LONG', 'UNIT_FAIL', 'NO_UNIT',
     if ($result eq '' ) {         'UNIT_NOTNEEDED', 'WANTED_NUMERIC',
  foreach $award (@_) { if ($award eq 'SUBMITTED') {$result=$award; last;} }         'BAD_FORMULA', 'SIG_FAIL', 'INCORRECT', 
     }         'MISORDERED_RANK', 'INVALID_FILETYPE',
     if ($result eq '' ) {         'DRAFT', 'SUBMITTED', 'ASSIGNED_SCORE',
  foreach $award (@_) { if ($award eq 'ASSIGNED_SCORE') {$result=$award; last;} }         'APPROX_ANS', 'EXACT_ANS') {
    ($result,$msg)=&checkstatus($possibleaward,$awardref,$msgref);
    if (defined($result)) { return ($result,$msg); }
     }      }
     if ($result eq '' ) {      return ('ERROR',undef);
  foreach $award (@_) { if ($award eq 'APPROX_ANS') {$result=$award; last;} }  
     }  
     if ($result eq '' ) { $result='EXACT_ANS'; }  
     return $result  
 }  }
   
 sub decideoutput {  sub decideoutput {
     my ($award,$solved,$previous,$target)=@_;      my ($award,$awardmsg,$solved,$previous,$target)=@_;
     my $message='';      my $message='';
     my $button=0;      my $button=0;
     my $previousmsg;      my $previousmsg;
Line 439  sub decideoutput { Line 410  sub decideoutput {
  $bgcolor=$possiblecolors{'not_charged_try'};   $bgcolor=$possiblecolors{'not_charged_try'};
  $button=1;   $button=1;
     } elsif ($award eq 'SIG_FAIL') {      } elsif ($award eq 'SIG_FAIL') {
  $message = &mt("Significant figures are incorrect, submission was not graded.");# you provided %s significant figures";   $message = &mt("Significant figures are incorrect, you provided [_1] significant figures while [_2] to [_3] were expected. Submission not graded.",(split(/:/,$awardmsg)));
  $bgcolor=$possiblecolors{'not_charged_try'};   $bgcolor=$possiblecolors{'not_charged_try'};
  $button=1;   $button=1;
     } elsif ($award eq 'UNIT_FAIL') {      } elsif ($award eq 'UNIT_FAIL') {
  $message = &mt("Units incorrect.");   $message = &mt('Units incorrect. Computer reads units as "[_1]"',
  if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units');} #Computer reads units as %s";         $awardmsg);
    if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units');} 
  $bgcolor=$possiblecolors{'not_charged_try'};   $bgcolor=$possiblecolors{'not_charged_try'};
  $button=1;   $button=1;
     } elsif ($award eq 'UNIT_NOTNEEDED') {      } elsif ($award eq 'UNIT_NOTNEEDED') {
  $message = &mt("Only a number required.");# Computer reads units of %s";   $message = &mt('Only a number required. Computer reads units of "[_1]"',$awardmsg);
  $bgcolor=$possiblecolors{'not_charged_try'};   $bgcolor=$possiblecolors{'not_charged_try'};
  $button=1;   $button=1;
     } elsif ($award eq 'NO_UNIT') {      } elsif ($award eq 'NO_UNIT') {
Line 500  sub removealldata { Line 472  sub removealldata {
 }  }
   
 sub setgradedata {  sub setgradedata {
     my ($award,$id,$previously_used) = @_;      my ($award,$msg,$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::scantronmode &&      if (!$Apache::lonhomework::scantronmode &&
  $Apache::inputtags::status['-1'] ne 'CAN_ANSWER' &&   $Apache::inputtags::status['-1'] ne 'CAN_ANSWER' &&
Line 569  sub setgradedata { Line 541  sub setgradedata {
  $Apache::lonhomework::results{"resource.$id.awarded"} = 0;   $Apache::lonhomework::results{"resource.$id.awarded"} = 0;
     }      }
  }   }
    if (defined($msg)) {
       $Apache::lonhomework::results{"resource.$id.awardmsg"} = $msg;
    }
  # did either of the overall awards chage? If so ignore the    # did either of the overall awards chage? If so ignore the 
  # previous check   # previous check
  if (($Apache::lonhomework::results{"resource.$id.awarded"} eq   if (($Apache::lonhomework::results{"resource.$id.awarded"} eq
Line 608  sub grade { Line 582  sub grade {
     my $id = $Apache::inputtags::part;      my $id = $Apache::inputtags::part;
     my $response='';      my $response='';
     if ( defined $ENV{'form.submitted'}) {      if ( defined $ENV{'form.submitted'}) {
  my @awards = ();   my (@awards,@msgs);
  foreach $response (@Apache::inputtags::response) {   foreach $response (@Apache::inputtags::response) {
     &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"};
     &Apache::lonxml::debug("keeping $value from $response for $id");      &Apache::lonxml::debug("keeping $value from $response for $id");
     push (@awards,$value);      push (@awards,$value);
       $value=$Apache::lonhomework::results{"resource.$id.$response.awardmsg"};
       &Apache::lonxml::debug("got message $value from $response for $id");
       push (@msgs,$value);
  }   }
  my $finalaward = &finalizeawards(@awards);   my ($finalaward,$msg) = &finalizeawards(\@awards,\@msgs);
  my $previously_used;   my $previously_used;
  if ( $#Apache::inputtags::previous eq $#awards ) {   if ( $#Apache::inputtags::previous eq $#awards ) {
     my $match=0;      my $match=0;
Line 636  sub grade { Line 613  sub grade {
  }   }
     }      }
  }   }
  &Apache::lonxml::debug("final award $finalaward, $previously_used");   &Apache::lonxml::debug("final award $finalaward, $previously_used, message $msg");
  &setgradedata($finalaward,$id,$previously_used);   &setgradedata($finalaward,$msg,$id,$previously_used);
     }      }
     return '';      return '';
 }  }
Line 659  sub gradestatus { Line 636  sub gradestatus {
  my $award = $Apache::lonhomework::history{"resource.$id.award"};   my $award = $Apache::lonhomework::history{"resource.$id.award"};
  my $solved = $Apache::lonhomework::history{"resource.$id.solved"};   my $solved = $Apache::lonhomework::history{"resource.$id.solved"};
  my $previous = $Apache::lonhomework::history{"resource.$id.previous"};   my $previous = $Apache::lonhomework::history{"resource.$id.previous"};
  &Apache::lonxml::debug("Found Award |$award|$solved|");   my $awardmsg = $Apache::lonhomework::history{"resource.$id.awardmsg"};
    &Apache::lonxml::debug("Found Award |$award|$solved|$awardmsg");
  if ( $award ne '' || $solved ne '') {   if ( $award ne '' || $solved ne '') {
     &Apache::lonxml::debug('Getting message');      &Apache::lonxml::debug('Getting message');
     ($showbutton,$bgcolor,$message,$previousmsg) =      ($showbutton,$bgcolor,$message,$previousmsg) =
  &decideoutput($award,$solved,$previous,$target);   &decideoutput($award,$awardmsg,$solved,$previous,$target);
     if ($target eq 'tex') {      if ($target eq 'tex') {
  $message='\vskip 2 mm '.$message.' ';   $message='\vskip 2 mm '.$message.' ';
     } else {      } else {
Line 691  sub gradestatus { Line 669  sub gradestatus {
     $trystr = '\vskip 0 mm ';      $trystr = '\vskip 0 mm ';
  }   }
     } else {      } else {
  $trystr = "<td>".$tries_text." $tries";   $trystr = "<td><nobr>".$tries_text." $tries";
  if($ENV{'request.state'} ne 'construct') {   if($ENV{'request.state'} ne 'construct') {
     $trystr.="/$maxtries";      $trystr.="/$maxtries";
  } else {   } else {
Line 699  sub gradestatus { Line 677  sub gradestatus {
  $trystr.="/".$Apache::inputtags::params{'maxtries'};   $trystr.="/".$Apache::inputtags::params{'maxtries'};
     }      }
  }   }
  $trystr.="</td>";   $trystr.="</nobr></td>";
     }      }
  }   }
  if ( $status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {$showbutton = 0;}   if ( $status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {$showbutton = 0;}
Removed from v.1.135  
changed lines
  Added in v.1.136

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