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

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

version 1.17, 2000/12/12 22:35:52 version 1.38, 2001/07/13 14:02:35
Line 1 Line 1
 # The LearningOnline Network with CAPA  # The LearningOnline Network with CAPA
 # input  definitons  # input  definitons
   # 2/19 Guy 
   
 package Apache::inputtags;  package Apache::inputtags;
 use strict;  use strict;
Line 10  sub BEGIN { Line 11  sub BEGIN {
   
   
 sub initialize_inputtags {  sub initialize_inputtags {
     # list of current input ids
   @Apache::inputtags::input=();    @Apache::inputtags::input=();
     # list of all input ids seen in this problem
   @Apache::inputtags::inputlist=();    @Apache::inputtags::inputlist=();
     # list of all current response ids
   @Apache::inputtags::response=();    @Apache::inputtags::response=();
     #list of all response ids seen in this problem
   @Apache::inputtags::responselist=();    @Apache::inputtags::responselist=();
   @Apache::inputtags::answergroup=();    # id of current part, 0 means that no part is current (inside <problem> only
   $Apache::inputtags::part='';    $Apache::inputtags::part='';
     # list of problem date statuses, the first element is for <problem> 
     #if there is a second element it is for the current <part>
     @Apache::inputtags::status=();
     #hash of defined params for the current response
   %Apache::inputtags::params=();    %Apache::inputtags::params=();
 }  }
   
 sub start_input {  sub start_input {
   my ($parstack,$safeeval)=@_;    my ($parstack,$safeeval)=@_;
   my $args ='';    my $id = &Apache::lonxml::get_param('id',$parstack,$safeeval);
   if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }    if ($id eq '') { $id = $Apache::lonxml::curdepth; }
   my $id = &Apache::run::run("{$args;".'return $id}',$safeeval);  
   push (@Apache::inputtags::input,$id);    push (@Apache::inputtags::input,$id);
   push (@Apache::inputtags::inputlist,$id);    push (@Apache::inputtags::inputlist,$id);
   return $id;    return $id;
Line 35  sub end_input { Line 43  sub end_input {
 }  }
   
 sub start_textarea {  sub start_textarea {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   my $result = "";    my $result = "";
   my $id = &start_input($parstack,$safeeval);    my $id = &start_input($parstack,$safeeval);
   if ($target eq 'web') {    if ($target eq 'web') {
     $result= '<textarea name="HWVAL'.$id.'" value="">';      my $oldresponse = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.$Apache::inputtags::response['-1'].submission"};
       my $cols = &Apache::lonxml::get_param('cols',$parstack,$safeeval);
       if ( $cols eq '') { $cols = 80; }
       my $rows = &Apache::lonxml::get_param('rows',$parstack,$safeeval);
       if ( $rows eq '') { $rows = 10; }
       $result= '<textarea name="HWVAL'.$Apache::inputtags::response['-1'].'" '.
         "rows=\"$rows\" cols=\"$cols\">".$oldresponse;
       if ($oldresponse ne '') {
         #get rid of any startup text if the user has already responded
         &Apache::lonxml::get_all_text("/textarea",$$parser[$#$parser]);
       }
   }    }
   return $result;    return $result;
 }  }
   
 sub end_textarea {  sub end_textarea {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   if ($target eq 'web') {    if ($target eq 'web') {
     return "</textarea>";      return "</textarea>";
   }     } 
Line 54  sub end_textarea { Line 72  sub end_textarea {
 }  }
   
 sub start_textline {  sub start_textline {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   my $result = "";    my $result = "";
   if ($target eq 'web') {    if ($target eq 'web') {
     my $args ='';      my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval);
     if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }  
     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.$Apache::inputtags::part.$Apache::inputtags::response['-1'].submission"};      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.'" />';
     }
     if ($target eq 'edit') {
       $result.=&Apache::edit::tag_start($target,$token,&Apache::lonxml::description($token));
       $result.=&Apache::edit::text_arg('Size:','size',$token,'5')."</td></tr>";
       $result.=&Apache::edit::end_table;
     }
     if ($target eq 'modified') {
       my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'size');
       if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
   }    }
   return $result;    return $result;
 }  }
   
 sub end_textline {  sub end_textline {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     if ($target eq 'edit') { return ('','no'); }
   return "";    return "";
 }  }
   
 #answergroup is deprecated  
 #sub start_answergroup {  
 #  my ($target,$token,$parstack,$parser,$safeeval)=@_;  
 #  my $args ='';  
 #  if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }  
 #  my $id = &Apache::run::run("{$args;".'return $id}',$safeeval);  
 #  push (@Apache::inputtags::answergroup,$id);  
 #  if ($target == 'web') {  
 #      
 #  }  
 #  return '';  
 #}  
 #  
 #sub end_answergroup {  
 #  my ($target,$token,$parstack,$parser,$safeeval)=@_;  
 #  return ''; # <answergroup> has ben deprecated  
 #  my $args ='';  
 #  if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }  
 #  my $id = &Apache::run::run("{$args;".'return $id}',$safeeval);  
 #  push (@Apache::inputtags::answergroup,$id);  
 #  my $result='';  
 #  my $button='<input type="submit" name="submit" value="Submit All Answers">';  
 #  my $showbutton='1';  
 #  my $usedtry='1';  
 #  my $response='';  
 #  if ( $target == 'web' ) {  
 #    if ( defined $ENV{'form.submit'}) {  
 #    }  
 #    if ($showbutton > 0) { $result.=$button }  
 #  }  
 #  pop @Apache::inputtags::answergroup;  
 #  return $result;  
 #}  
   
   
 sub start_datasubmission {  sub start_datasubmission {
     return '';
 }  }
   
 sub end_datasubmission {  sub end_datasubmission {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   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 '';    return '';
 }  }
Line 128  sub finalizeawards { Line 120  sub finalizeawards {
   if ($result eq '' ) {    if ($result eq '' ) {
     foreach $award (@_) { if ($award eq 'ERROR') {$result='ERROR'; last;}}      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 '' ) {    if ($result eq '' ) {
     foreach $award (@_) {       foreach $award (@_) { 
Line 151  sub finalizeawards { Line 146  sub finalizeawards {
     foreach $award (@_) { if ($award eq 'INCORRECT') {$result=$award; last;} }      foreach $award (@_) { if ($award eq 'INCORRECT') {$result=$award; last;} }
   }    }
   if ($result eq '' ) {    if ($result eq '' ) {
       foreach $award (@_) { if ($award eq 'SUBMITTED') {$result=$award; last;} }
     }
     if ($result eq '' ) {
     foreach $award (@_) { if ($award eq 'APPROX_ANS') {$result=$award; last;} }      foreach $award (@_) { if ($award eq 'APPROX_ANS') {$result=$award; last;} }
   }    }
   if ($result eq '' ) { $result='EXACT_ANS'; }    if ($result eq '' ) { $result='EXACT_ANS'; }
Line 158  sub finalizeawards { Line 156  sub finalizeawards {
 }  }
   
 sub decideoutput {  sub decideoutput {
   my ($award)=@_;    my ($award,$solved)=@_;
   my $message='';    my $message='';
   my $button=0;    my $button=0;
   if      ($award eq 'EXACT_ANS' || $award eq 'APPROX_ANS' ) {    if      ($solved =~ /^correct/) {
     $message = "Correct computer gets %s";      $message = "<b>You are correct.</b> Your receipt is ".
         &Apache::lonnet::receipt;
     $button=0;      $button=0;
     } elsif ($solved =~ /^excused/) {
       $message = "<b>You are excused from the problem.</b>";
       $button=0;
     } elsif ($award eq 'EXACT_ANS' || $award eq 'APPROX_ANS' ) {
       if ($solved =~ /^incorrect/ || $solved eq '') {
         $message = "Incorrect";
         $button=1;
       } else {
         $message = "<b>You are correct.</b> Your receipt is ".
    &Apache::lonnet::receipt;
         $button=0;
       }
   } elsif ($award eq 'NO_RESPONSE') {    } elsif ($award eq 'NO_RESPONSE') {
     $message = '';      $message = '';
     $button=1;      $button=1;
Line 174  sub decideoutput { Line 185  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 191  sub decideoutput { Line 202  sub decideoutput {
   } elsif ($award eq 'INCORRECT') {    } elsif ($award eq 'INCORRECT') {
     $message = "Incorrect";      $message = "Incorrect";
     $button=1;      $button=1;
     } elsif ($award eq 'SUBMITTED') {
       $message = "Your submission has been recorded.";
       $button=1;
   } else {    } else {
     $message = "Unknown message: $award";      $message = "Unknown message: $award";
     $button=1;      $button=1;
Line 211  sub setgradedata { Line 225  sub setgradedata {
       $Apache::lonhomework::history{"resource.$id.tries"} + 1;        $Apache::lonhomework::history{"resource.$id.tries"} + 1;
     $Apache::lonhomework::results{"resource.$id.solved"} =      $Apache::lonhomework::results{"resource.$id.solved"} =
       'incorrect_attempted';        'incorrect_attempted';
     } elsif ( $award eq 'SUBMITTED' ) {
       $Apache::lonhomework::results{"resource.$id.tries"} =
         $Apache::lonhomework::history{"resource.$id.tries"} + 1;
       $Apache::lonhomework::results{"resource.$id.solved"} =
         'ungraded_attempted';
   } else {    } else {
     $Apache::lonhomework::results{"resource.$id.solved"} =      $Apache::lonhomework::results{"resource.$id.solved"} =
       'incorrect_attempted';        'incorrect_attempted';
Line 221  sub setgradedata { Line 240  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) {
  &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"};
  if ( $value ne '' ) {   if ( $value ne '' ) {
   &Apache::lonxml::debug("keep ing $value from $response for $id");    &Apache::lonxml::debug("keeping $value from $response for $id");
   push (@awards,$value);    push (@awards,$value);
  } else {   } else {
   &Apache::lonxml::debug("skipping $value from $response for $id");    &Apache::lonxml::debug("skipping $value from $response for $id");
Line 242  sub grade { Line 261  sub grade {
       &setgradedata($finalaward,$id);        &setgradedata($finalaward,$id);
     }      }
   }    }
   return $result;    return '';
 }  }
   
 sub gradestatus {  sub gradestatus {
Line 250  sub gradestatus { Line 269  sub gradestatus {
   my $showbutton = 1;    my $showbutton = 1;
   my $message = '';    my $message = '';
   my $trystr='';    my $trystr='';
     my $button='';    my $button='';
       
   my ($date,$passed) = &Apache::lonhomework::check_date("OPEN_DATE",$id);    my $status = $Apache::inputtags::status['-1'];
     &Apache::lonxml::debug("gradestatus has :$status:");
   if ( $passed ) {      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|");      my $solved = $Apache::lonhomework::history{"resource.$id.solved"};
       &Apache::lonxml::debug("Found Award |$award|$solved|");
     if ( $award ne '' ) {      if ( $award ne '' ) {
       &Apache::lonxml::debug('Getting message');        &Apache::lonxml::debug('Getting message');
       ($showbutton,$message) = &decideoutput($award);        ($showbutton,$message) = &decideoutput($award,$solved);
         $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("goit 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 ( $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.17  
changed lines
  Added in v.1.38

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