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

Diff for /loncom/homework/inputtags.pm between versions 1.12 and 1.17

version 1.12, 2000/12/05 22:07:26 version 1.17, 2000/12/12 22:35:52
Line 11  sub BEGIN { Line 11  sub BEGIN {
   
 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 = "";
     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;
 }  }
Line 32  sub end_textarea { Line 49  sub end_textarea {
   if ($target eq 'web') {    if ($target eq 'web') {
     return "</textarea>";      return "</textarea>";
   }     } 
     &end_input;
   return '';    return '';
 }  }
   
Line 43  sub start_textline { Line 61  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; }
     $result= '<input type="text" name="HWVAL'.$Apache::inputtags::curvalue.'" value="" size="'.$size.'">';      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.'">';
   }    }
   return $result;    return $result;
 }  }
Line 103  sub finalizeawards { Line 122  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 139  sub decideoutput { Line 164  sub decideoutput {
   if      ($award eq 'EXACT_ANS' || $award eq 'APPROX_ANS' ) {    if      ($award eq 'EXACT_ANS' || $award eq 'APPROX_ANS' ) {
     $message = "Correct computer gets %s";      $message = "Correct computer gets %s";
     $button=0;      $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') {    } elsif ($award eq 'WANTED_NUMERIC') {
     $message = "This question expects a numeric answer";      $message = "This question expects a numeric answer";
     $button=1;      $button=1;
Line 170  sub decideoutput { Line 201  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 {
Line 197  sub grade { Line 228  sub grade {
       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 218  sub gradestatus { Line 249  sub gradestatus {
   my ($id) = @_;    my ($id) = @_;
   my $showbutton = 1;    my $showbutton = 1;
   my $message = '';    my $message = '';
   my $award = $Apache::lonhomework::history{"resource.award.$id"};    my $trystr='';
   &Apache::lonxml::debug("Found Award |$award|");      my $button='';
   if ( $award ne '' ) {    
     &Apache::lonxml::debug('Getting message');    my ($date,$passed) = &Apache::lonhomework::check_date("OPEN_DATE",$id);
     ($showbutton,$message) = &decideoutput($award);  
   }    if ( $passed ) {  
   my $button='';      my $award = $Apache::lonhomework::history{"resource.$id.award"};
   my $tries = $Apache::lonhomework::history{"resource.tries.$id"};      &Apache::lonxml::debug("Found Award |$award|");
   my $maxtries = $Apache::lonhomework::history{"resource.maxtries.$id"};      if ( $award ne '' ) {
   if ( $tries eq '' ) { $tries = '0'; }        &Apache::lonxml::debug('Getting message');
   if ( $maxtries eq '' ) { $maxtries = '99'; }         ($showbutton,$message) = &decideoutput($award);
   if ( $tries >= $maxtries ) { $showbutton = 0; }      }
   my $trystr = "Tries $tries/$maxtries";      my $tries = $Apache::lonhomework::history{"resource.$id.tries"};
   if ( $showbutton ) {       my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries");
     $button = '<input type="submit" name="submit" value="Submit All Answers"><br></br>';      &Apache::lonxml::debug("goit maxtries of :$maxtries:");
       if ( $tries eq '' ) { $tries = '0'; }
       if ( $maxtries eq '' ) { $maxtries = '2'; } 
       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;    return $button.$message.$trystr;
 }  }
Removed from v.1.12  
changed lines
  Added in v.1.17

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