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

version 1.9, 2000/12/01 00:44:48 version 1.14, 2000/12/11 23:47:36
Line 5  package Apache::inputtags; Line 5  package Apache::inputtags;
 use strict;  use strict;
   
 sub BEGIN {  sub BEGIN {
   &Apache::lonxml::register('Apache::inputtags',('textarea','textline','answergroup','datasubmission'));    &Apache::lonxml::register('Apache::inputtags',('textarea','textline','datasubmission'));
 }  }
   
   
 sub initialize_inputtags {  sub initialize_inputtags {
   @Apache::inputtags::input=();    @Apache::inputtags::input=();
     @Apache::inputtags::inputlist=();
   @Apache::inputtags::response=();    @Apache::inputtags::response=();
   @Apache::inputtags::responselist=();    @Apache::inputtags::responselist=();
   @Apache::inputtags::answergroup=();    @Apache::inputtags::answergroup=();
Line 18  sub initialize_inputtags { Line 19  sub initialize_inputtags {
   %Apache::inputtags::params=();    %Apache::inputtags::params=();
 }  }
   
   sub start_input {
     my ($parstack,$safeeval)=@_;
     my $args ='';
     if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
     my $id = &Apache::run::run("{$args;".'return $id}',$safeeval);
     push (@Apache::inputtags::input,$id);
     push (@Apache::inputtags::inputlist,$id);
     return $id;
   }
   
   sub end_input {
     pop @Apache::inputtags::input;
     return '';
   }
   
 sub start_textarea {  sub start_textarea {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$parstack,$parser,$safeeval)=@_;
   my $result = "";    my $result = "";
   $Apache::inputtags::curvalue++;    my $id = &start_input($parstack,$safeeval);
   if ($target eq 'web') {    if ($target eq 'web') {
     $result= '<textarea name="HWVAL'.$Apache::inputtags::curvalue.'" value="">';      $result= '<textarea name="HWVAL'.$id.'" value="">';
   }    }
   return $result;    return $result;
 }  }
   
 sub end_textarea {  sub end_textarea {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$parstack,$parser,$safeeval)=@_;
   return "</textarea>";    if ($target eq 'web') {
       return "</textarea>";
     } 
     &end_input;
     return '';
 }  }
   
 sub start_textline {  sub start_textline {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$parstack,$parser,$safeeval)=@_;
   my $result = "";    my $result = "";
   $Apache::inputtags::curvalue++;  
   my $args ='';  
   if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }  
   my $size = &Apache::run::run("{$args;".'return $size}',$safeeval);  
   if ($size eq '') { $size=20; }  
   if ($target eq 'web') {    if ($target eq 'web') {
     $result= '<input type="text" name="HWVAL'.$Apache::inputtags::curvalue.'" value="" size="'.$size.'">';      my $args ='';
       if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
       my $size = &Apache::run::run("{$args;".'return $size}',$safeeval);
       if ($size eq '') { $size=20; }
       my $oldresponse = $Apache::lonhomework::history{"resource.submission.$Apache::inputtags::part.$Apache::inputtags::response['-1']"};
       $result= '<input type="text" name="HWVAL'.$Apache::inputtags::response['-1'].'" value="'.$oldresponse.'" size="'.$size.'">';
   }    }
   return $result;    return $result;
 }  }
Line 52  sub end_textline { Line 72  sub end_textline {
   return "";    return "";
 }  }
   
 sub start_answergroup {  #answergroup is deprecated
   my ($target,$token,$parstack,$parser,$safeeval)=@_;  #sub start_answergroup {
   my $args ='';  #  my ($target,$token,$parstack,$parser,$safeeval)=@_;
   if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }  #  my $args ='';
   my $id = &Apache::run::run("{$args;".'return $id}',$safeeval);  #  if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
   push (@Apache::inputtags::answergroup,$id);  #  my $id = &Apache::run::run("{$args;".'return $id}',$safeeval);
   if ($target == 'web') {  #  push (@Apache::inputtags::answergroup,$id);
       #  if ($target == 'web') {
   }  #    
   return '';  #  }
 }  #  return '';
   #}
 sub end_answergroup {  #
   my ($target,$token,$parstack,$parser,$safeeval)=@_;  #sub end_answergroup {
   return ''; # <answergroup> has ben deprecated  #  my ($target,$token,$parstack,$parser,$safeeval)=@_;
   my $args ='';  #  return ''; # <answergroup> has ben deprecated
   if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }  #  my $args ='';
   my $id = &Apache::run::run("{$args;".'return $id}',$safeeval);  #  if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
   push (@Apache::inputtags::answergroup,$id);  #  my $id = &Apache::run::run("{$args;".'return $id}',$safeeval);
   my $result='';  #  push (@Apache::inputtags::answergroup,$id);
   my $button='<input type="submit" name="submit" value="Submit All Answers">';  #  my $result='';
   my $showbutton='1';  #  my $button='<input type="submit" name="submit" value="Submit All Answers">';
   my $usedtry='1';  #  my $showbutton='1';
   my $response='';  #  my $usedtry='1';
   if ( $target == 'web' ) {  #  my $response='';
     if ( defined $ENV{'form.submit'}) {  #  if ( $target == 'web' ) {
     }  #    if ( defined $ENV{'form.submit'}) {
     if ($showbutton > 0) { $result.=$button }  #    }
   }  #    if ($showbutton > 0) { $result.=$button }
   pop @Apache::inputtags::answergroup;  #  }
   return $result;  #  pop @Apache::inputtags::answergroup;
 }  #  return $result;
   #}
   
   
 sub start_datasubmission {  sub start_datasubmission {
Line 94  sub end_datasubmission { Line 115  sub end_datasubmission {
   if ( $target == 'web' ) {    if ( $target == 'web' ) {
     return '<input type="submit" name="submit" value="Submit All Data">';      return '<input type="submit" name="submit" value="Submit All Data">';
   }    }
     return '';
 }  }
   
 sub finalizeawards {  sub finalizeawards {
Line 110  sub finalizeawards { Line 132  sub finalizeawards {
       }        }
     }      }
   }    }
   &Apache::lonxml::debug("1 $result");  
   if ($result eq '' ) {    if ($result eq '' ) {
     foreach $award (@_) {       foreach $award (@_) { 
       if ($award eq 'WANTED_NUMERIC' ||         if ($award eq 'WANTED_NUMERIC' || 
   $award eq 'BAD_FORMULA') {$result=$award; last;}    $award eq 'BAD_FORMULA') {$result=$award; last;}
     }      }
   }    }
   &Apache::lonxml::debug("2 $result");  
   if ($result eq '' ) {    if ($result eq '' ) {
     foreach $award (@_) { if ($award eq 'SIG_FAIL') {$result=$award; last;} }      foreach $award (@_) { if ($award eq 'SIG_FAIL') {$result=$award; last;} }
   }    }
   &Apache::lonxml::debug("3 $result");  
   if ($result eq '' ) {    if ($result eq '' ) {
     foreach $award (@_) { if ($award eq 'INCORRECT') {$result=$award; last;} }      foreach $award (@_) { if ($award eq 'INCORRECT') {$result=$award; last;} }
   }    }
   &Apache::lonxml::debug("4 $result");  
   if ($result eq '' ) {    if ($result eq '' ) {
     foreach $award (@_) { if ($award eq 'APPROX_ANS') {$result=$award; last;} }      foreach $award (@_) { if ($award eq 'APPROX_ANS') {$result=$award; last;} }
   }    }
   &Apache::lonxml::debug("5 $result");  
   if ($result eq '' ) { $result='EXACT_ANS'; }    if ($result eq '' ) { $result='EXACT_ANS'; }
   &Apache::lonxml::debug("6 $result");  
   return $result    return $result
 }  }
   
   sub decideoutput {
     my ($award)=@_;
     my $message='';
     my $button=0;
     if      ($award eq 'EXACT_ANS' || $award eq 'APPROX_ANS' ) {
       $message = "Correct computer gets %s";
       $button=0;
     } elsif ($award eq 'NO_RESPONSE') {
       $message = '';
       $button=1;
     } elsif ($award eq 'MISSING_ANSWER') {
       $message = 'Some parts were not submitted';
       $button = 1;
     } elsif ($award eq 'WANTED_NUMERIC') {
       $message = "This question expects a numeric answer";
       $button=1;
     } elsif ($award eq 'SIG_FAIL') {
       $message = "Please adjust significant figures, you provided %s significant figures";
       $button=1;
     } elsif ($award eq 'UNIT_FAIL') {
       $message = "Units incorrect, Computer reads units as %s";
       $button=1;
     } elsif ($award eq 'UNIT_NOTNEEDED') {
       $message = "Only a number required, Computer reads units of %s";
       $button=1;
     } elsif ($award eq 'NO_UNIT') {
       $message = "Units required";
       $button=1;
     } elsif ($award eq 'BAD_FORMULA') {
       $message = "Unable to understand formula";
       $button=1;
     } elsif ($award eq 'INCORRECT') {
       $message = "Incorrect";
       $button=1;
     } else {
       $message = "Unknown message: $award";
       $button=1;
     }
     return ($button,$message);
   }
   
   sub setgradedata {
     my ($award,$id) = @_;
     if ( $award eq 'APPROX_ANS' || $award eq 'EXACT_ANS' ) {
       $Apache::lonhomework::results{"resource.tries.$id"} =
         $Apache::lonhomework::history{"resource.tries.$id"} + 1;
       $Apache::lonhomework::results{"resource.solved.$id"} =
         'correct_by_student';
       $Apache::lonhomework::results{"resource.awarded.$id"} = '1';
     } elsif ( $award eq 'INCORRECT' ) {
       $Apache::lonhomework::results{"resource.tries.$id"} =
         $Apache::lonhomework::history{"resource.tries.$id"} + 1;
       $Apache::lonhomework::results{"resource.solved.$id"} =
         'incorrect_attempted';
     } else {
       $Apache::lonhomework::results{"resource.solved.$id"} =
         'incorrect_attempted';
     }
     $Apache::lonhomework::results{"resource.award.$id"} = $award;
   }
   
 sub grade {  sub grade {
   my ($target) = @_;    my ($target) = @_;
   my $id = $Apache::inputtags::part;    my $id = $Apache::inputtags::part;
   my $result='';    my $result='';
   my $button='<input type="submit" name="submit" value="Submit All Answers">';  
   my $showbutton='1';  
   my $usedtry='1';  
   my $response='';    my $response='';
   if ( $target == 'web' ) {    if ( $target == 'web' ) {
     if ( defined $ENV{'form.submit'}) {      if ( defined $ENV{'form.submit'}) {
       my @awards = ();        my @awards = ();
         &Apache::lonxml::debug("$#Apache::inputtags::responselist");
       foreach $response (@Apache::inputtags::responselist) {        foreach $response (@Apache::inputtags::responselist) {
  my $value=$Apache::lonhomework::results{"response.awarddetail.$id.$response"};   &Apache::lonxml::debug("looking for response.awarddetail.$id.$response");
    my $value=$Apache::lonhomework::results{"resource.awarddetail.$id.$response"};
  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 157  sub grade { Line 233  sub grade {
       }        }
       my $finalaward = &finalizeawards(@awards);        my $finalaward = &finalizeawards(@awards);
       &Apache::lonxml::debug("final award $finalaward");        &Apache::lonxml::debug("final award $finalaward");
         &setgradedata($finalaward,$id);
     }      }
     if ($showbutton > 0) { $result.=$button }  
   }    }
   return $result;    return $result;
 }  }
   
   sub gradestatus {
     my ($id) = @_;
     my $showbutton = 1;
     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='';
     if ( $showbutton ) {
       $trystr = "<br></br>Tries $tries/$maxtries";
     }
     if ( $tries >= $maxtries ) { $showbutton = 0; }
     if ( $showbutton ) { 
       $button = '<input type="submit" name="submit" value="Submit All Answers"><br></br>';
     }
     return $button.$message.$trystr;
   }
 1;  1;
 __END__  __END__
     

Removed from v.1.9  
changed lines
  Added in v.1.14


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