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

version 1.32, 2001/04/26 21:22:35 version 1.38, 2001/07/13 14:02:35
Line 11  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=();    @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 37  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') {
     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"};
     my $args ='';      my $cols = &Apache::lonxml::get_param('cols',$parstack,$safeeval);
     if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }  
     my $cols = &Apache::run::run("{$args;".'return $cols}',$safeeval);  
     if ( $cols eq '') { $cols = 80; }      if ( $cols eq '') { $cols = 80; }
     my $rows = &Apache::run::run("{$args;".'return $rows}',$safeeval);      my $rows = &Apache::lonxml::get_param('rows',$parstack,$safeeval);
     if ( $rows eq '') { $rows = 10; }      if ( $rows eq '') { $rows = 10; }
     $result= '<textarea name="HWVAL'.$Apache::inputtags::response['-1'].'" '.      $result= '<textarea name="HWVAL'.$Apache::inputtags::response['-1'].'" '.
       "rows=\"$rows\" cols=\"$cols\">".$oldresponse;        "rows=\"$rows\" cols=\"$cols\">".$oldresponse;
Line 59  sub start_textarea { Line 63  sub start_textarea {
 }  }
   
 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 68  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.submitted'}) {  
 #    }  
 #    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" />';
   }    }
Line 181  sub decideoutput { Line 159  sub decideoutput {
   my ($award,$solved)=@_;    my ($award,$solved)=@_;
   my $message='';    my $message='';
   my $button=0;    my $button=0;
   if      ($solved =~ /^correct/ || $award eq 'EXACT_ANS' || $award eq 'APPROX_ANS' ) {    if      ($solved =~ /^correct/) {
     $message = "<b>You are correct.</b> Your receipt is ".&Apache::lonnet::receipt;      $message = "<b>You are correct.</b> Your receipt is ".
         &Apache::lonnet::receipt;
       $button=0;
     } elsif ($solved =~ /^excused/) {
       $message = "<b>You are excused from the problem.</b>";
     $button=0;      $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;

Removed from v.1.32  
changed lines
  Added in v.1.38


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