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

Diff for /loncom/homework/inputtags.pm between versions 1.14 and 1.26

version 1.14, 2000/12/11 23:47:36 version 1.26, 2001/01/24 17:02:17
Line 16  sub initialize_inputtags { Line 16  sub initialize_inputtags {
   @Apache::inputtags::responselist=();    @Apache::inputtags::responselist=();
   @Apache::inputtags::answergroup=();    @Apache::inputtags::answergroup=();
   $Apache::inputtags::part='';    $Apache::inputtags::part='';
     @Apache::inputtags::status=();
   %Apache::inputtags::params=();    %Apache::inputtags::params=();
 }  }
   
Line 61  sub start_textline { Line 62  sub start_textline {
     if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }      if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
     my $size = &Apache::run::run("{$args;".'return $size}',$safeeval);      my $size = &Apache::run::run("{$args;".'return $size}',$safeeval);
     if ($size eq '') { $size=20; }      if ($size eq '') { $size=20; }
     my $oldresponse = $Apache::lonhomework::history{"resource.submission.$Apache::inputtags::part.$Apache::inputtags::response['-1']"};      my $oldresponse = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.$Apache::inputtags::response['-1'].submission"};
     $result= '<input type="text" name="HWVAL'.$Apache::inputtags::response['-1'].'" value="'.$oldresponse.'" size="'.$size.'">';      $result= '<input type="text" name="HWVAL'.$Apache::inputtags::response['-1'].'" value="'.$oldresponse.'" size="'.$size.'">';
   }    }
   return $result;    return $result;
Line 98  sub end_textline { Line 99  sub end_textline {
 #  my $usedtry='1';  #  my $usedtry='1';
 #  my $response='';  #  my $response='';
 #  if ( $target == 'web' ) {  #  if ( $target == 'web' ) {
 #    if ( defined $ENV{'form.submit'}) {  #    if ( defined $ENV{'form.submitted'}) {
 #    }  #    }
 #    if ($showbutton > 0) { $result.=$button }  #    if ($showbutton > 0) { $result.=$button }
 #  }  #  }
Line 122  sub finalizeawards { Line 123  sub finalizeawards {
   my $result='';    my $result='';
   my $award;    my $award;
   if ($#_ == '-1') { $result = "NO_RESPONSE"; }    if ($#_ == '-1') { $result = "NO_RESPONSE"; }
   foreach $award (@_) { if ($award eq '') {$result='MISSING_ANSWER'; last;}}    if ($result eq '' ) {
       foreach $award (@_) { if ($award eq '') {$result='MISSING_ANSWER'; last;}}
     }
     if ($result eq '' ) {
       foreach $award (@_) { if ($award eq 'ERROR') {$result='ERROR'; last;}}
     }
   
   if ($result eq '' ) {    if ($result eq '' ) {
     foreach $award (@_) {       foreach $award (@_) { 
       if ($award eq 'UNIT_FAIL' ||        if ($award eq 'UNIT_FAIL' ||
Line 156  sub decideoutput { Line 163  sub decideoutput {
   my $message='';    my $message='';
   my $button=0;    my $button=0;
   if      ($award eq 'EXACT_ANS' || $award eq 'APPROX_ANS' ) {    if      ($award eq 'EXACT_ANS' || $award eq 'APPROX_ANS' ) {
     $message = "Correct computer gets %s";      $message = "<b>You are correct.</b> Your receipt is ".&Apache::lonnet::receipt;
     $button=0;      $button=0;
   } elsif ($award eq 'NO_RESPONSE') {    } elsif ($award eq 'NO_RESPONSE') {
     $message = '';      $message = '';
Line 168  sub decideoutput { Line 175  sub decideoutput {
     $message = "This question expects a numeric answer";      $message = "This question expects a numeric answer";
     $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";
     $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";
     $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";
     $button=1;      $button=1;
   } elsif ($award eq 'NO_UNIT') {    } elsif ($award eq 'NO_UNIT') {
     $message = "Units required";      $message = "Units required";
Line 195  sub decideoutput { Line 202  sub decideoutput {
 sub setgradedata {  sub setgradedata {
   my ($award,$id) = @_;    my ($award,$id) = @_;
   if ( $award eq 'APPROX_ANS' || $award eq 'EXACT_ANS' ) {    if ( $award eq 'APPROX_ANS' || $award eq 'EXACT_ANS' ) {
     $Apache::lonhomework::results{"resource.tries.$id"} =      $Apache::lonhomework::results{"resource.$id.tries"} =
       $Apache::lonhomework::history{"resource.tries.$id"} + 1;        $Apache::lonhomework::history{"resource.$id.tries"} + 1;
     $Apache::lonhomework::results{"resource.solved.$id"} =      $Apache::lonhomework::results{"resource.$id.solved"} =
       'correct_by_student';        'correct_by_student';
     $Apache::lonhomework::results{"resource.awarded.$id"} = '1';      $Apache::lonhomework::results{"resource.$id.awarded"} = '1';
   } elsif ( $award eq 'INCORRECT' ) {    } elsif ( $award eq 'INCORRECT' ) {
     $Apache::lonhomework::results{"resource.tries.$id"} =      $Apache::lonhomework::results{"resource.$id.tries"} =
       $Apache::lonhomework::history{"resource.tries.$id"} + 1;        $Apache::lonhomework::history{"resource.$id.tries"} + 1;
     $Apache::lonhomework::results{"resource.solved.$id"} =      $Apache::lonhomework::results{"resource.$id.solved"} =
       'incorrect_attempted';        'incorrect_attempted';
   } else {    } else {
     $Apache::lonhomework::results{"resource.solved.$id"} =      $Apache::lonhomework::results{"resource.$id.solved"} =
       'incorrect_attempted';        'incorrect_attempted';
   }    }
   $Apache::lonhomework::results{"resource.award.$id"} = $award;    $Apache::lonhomework::results{"resource.$id.award"} = $award;
 }  }
   
 sub grade {  sub grade {
   my ($target) = @_;    my ($target) = @_;
   my $id = $Apache::inputtags::part;    my $id = $Apache::inputtags::part;
   my $result='';  #  my $result='';
   my $response='';    my $response='';
   if ( $target == 'web' ) {    if ( $target == 'web' ) {
     if ( defined $ENV{'form.submit'}) {      if ( defined $ENV{'form.submitted'}) {
       my @awards = ();        my @awards = ();
       &Apache::lonxml::debug("$#Apache::inputtags::responselist");        &Apache::lonxml::debug("$#Apache::inputtags::responselist");
       foreach $response (@Apache::inputtags::responselist) {        foreach $response (@Apache::inputtags::responselist) {
  &Apache::lonxml::debug("looking for response.awarddetail.$id.$response");   &Apache::lonxml::debug("looking for response.$id.$response.awarddetail");
  my $value=$Apache::lonhomework::results{"resource.awarddetail.$id.$response"};   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("keep ing $value from $response for $id");
   push (@awards,$value);    push (@awards,$value);
Line 236  sub grade { Line 243  sub grade {
       &setgradedata($finalaward,$id);        &setgradedata($finalaward,$id);
     }      }
   }    }
   return $result;    return '';
 }  }
   
 sub gradestatus {  sub gradestatus {
   my ($id) = @_;    my ($id) = @_;
   my $showbutton = 1;    my $showbutton = 1;
   my $message = '';    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 = '2'; }   
   my $trystr='';    my $trystr='';
   if ( $showbutton ) {    my $button='';
     $trystr = "<br></br>Tries $tries/$maxtries";    
   }    my $status = $Apache::inputtags::status['-1'];
   if ( $tries >= $maxtries ) { $showbutton = 0; }    &Apache::lonxml::debug("gradestatus has :$status:");
   if ( $showbutton ) {     if ( $status ne 'CLOSED' ) {  
     $button = '<input type="submit" name="submit" value="Submit All Answers"><br></br>';      my $award = $Apache::lonhomework::history{"resource.$id.award"};
       &Apache::lonxml::debug("Found Award |$award|");
       if ( $award ne '' ) {
         &Apache::lonxml::debug('Getting message');
         ($showbutton,$message) = &decideoutput($award);
         $message="<br /><table bgcolor=\"#aaffaa\"><tr><td>$message</td></tr></table>";
       }
       my $tries = $Apache::lonhomework::history{"resource.$id.tries"};
       my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries");
       &Apache::lonxml::debug("got maxtries of :$maxtries:");
       if ( $tries eq '' ) { $tries = '0'; }
       if ( $maxtries eq '' ) { $maxtries = '2'; } 
       if ( $maxtries eq 'con_lost' ) { $maxtries = '0'; } 
       if ( $showbutton ) {
         $trystr = "<br></br>Tries $tries/$maxtries";
       }
       if ( $status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {$showbutton = 0;}
       if ( $showbutton ) { 
         $button = '<br></br><input type="submit" name="submit" value="Submit All Answers">';
       }
   }    }
   return $button.$message.$trystr;    return $button.$message.$trystr;
 }  }
Removed from v.1.14  
changed lines
  Added in v.1.26

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