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

Diff for /loncom/homework/inputtags.pm between versions 1.18 and 1.27

version 1.18, 2000/12/15 20:31:30 version 1.27, 2001/02/19 20:34:20
Line 99  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 163  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 175  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 222  sub setgradedata { Line 222  sub setgradedata {
 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) {
Line 243  sub grade { Line 243  sub grade {
       &setgradedata($finalaward,$id);        &setgradedata($finalaward,$id);
     }      }
   }    }
   return $result;    return '';
 }  }
   
 sub gradestatus {  sub gradestatus {
Line 253  sub gradestatus { Line 253  sub gradestatus {
   my $trystr='';    my $trystr='';
   my $button='';    my $button='';
       
   my $status = $Apache::lonhomework::part['-1'];    my $status = $Apache::inputtags::status['-1'];
     &Apache::lonxml::debug("gradestatus has :$status:");
   if ( $status eq 'CAN_ANSWER' || $status eq 'SHOW_ANSWER' ) {      if ( $status ne 'CLOSED' ) {  
     my $award = $Apache::lonhomework::history{"resource.$id.award"};      my $award = $Apache::lonhomework::history{"resource.$id.award"};
     &Apache::lonxml::debug("Found Award |$award|");      &Apache::lonxml::debug("Found Award |$award|");
     if ( $award ne '' ) {      if ( $award ne '' ) {
       &Apache::lonxml::debug('Getting message');        &Apache::lonxml::debug('Getting message');
       ($showbutton,$message) = &decideoutput($award);        ($showbutton,$message) = &decideoutput($award);
         $message="<br /><table bgcolor=\"#aaffaa\"><tr><td>$message</td></tr></table>";
     }      }
     my $tries = $Apache::lonhomework::history{"resource.$id.tries"};      my $tries = $Apache::lonhomework::history{"resource.$id.tries"};
     my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries");      my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries");
     &Apache::lonxml::debug("got maxtries of :$maxtries:");      &Apache::lonxml::debug("got maxtries of :$maxtries:");
     if ( $tries eq '' ) { $tries = '0'; }      if ( $tries eq '' ) { $tries = '0'; }
     if ( $maxtries eq '' ) { $maxtries = '2'; }       if ( $maxtries eq '' ) { $maxtries = '2'; } 
       if ( $maxtries eq 'con_lost' ) { $maxtries = '0'; } 
     if ( $showbutton ) {      if ( $showbutton ) {
       $trystr = "<br></br>Tries $tries/$maxtries";        $trystr = "<br />Tries $tries/$maxtries";
     }      }
     if ( $tries >= $maxtries ) { $showbutton = 0; }      if ( $status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {$showbutton = 0;}
     if ( $status eq 'SHOW_ANSWER' ) { $showbutton = 0; }  
     if ( $showbutton ) {       if ( $showbutton ) { 
       $button = '<input type="submit" name="submit" value="Submit All Answers"><br></br>';        $button = '<br /><input type="submit" name="submit" value="Submit All Answers" />';
     }      }
   }    }
   return $button.$message.$trystr;    return $button.$message.$trystr;
Removed from v.1.18  
changed lines
  Added in v.1.27

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