Diff for /loncom/homework/inputtags.pm between versions 1.10 and 1.52

version 1.10, 2000/12/04 21:15:33 version 1.52, 2002/01/30 17:32:42
Line 1 Line 1
 # The LearningOnline Network with CAPA  # The LearningOnline Network with CAPA
 # input  definitons  # input  definitons
   #
   # $Id$
   #
   # Copyright Michigan State University Board of Trustees
   #
   # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
   #
   # LON-CAPA is free software; you can redistribute it and/or modify
   # it under the terms of the GNU General Public License as published by
   # the Free Software Foundation; either version 2 of the License, or
   # (at your option) any later version.
   #
   # LON-CAPA is distributed in the hope that it will be useful,
   # but WITHOUT ANY WARRANTY; without even the implied warranty of
   # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   # GNU General Public License for more details.
   #
   # You should have received a copy of the GNU General Public License
   # along with LON-CAPA; if not, write to the Free Software
   # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   #
   # /home/httpd/html/adm/gpl.txt
   #
   # http://www.lon-capa.org/
   #
   # 2/19 Guy 
   
 package Apache::inputtags;  package Apache::inputtags;
 use strict;  use strict;
   
 sub BEGIN {  BEGIN {
   &Apache::lonxml::register('Apache::inputtags',('textarea','textline','datasubmission'));    &Apache::lonxml::register('Apache::inputtags',('textfield','textline','datasubmission'));
 }  }
   
   
 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=();
     # 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=();    # list of whether or not a specific response was previously used
     @Apache::inputtags::previous=();
     # 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=();
     # list of all ids, for <import>, these get join()ed and prepended
     @Apache::inputtags::import=();
   }
   
   sub start_input {
     my ($parstack,$safeeval)=@_;
     my $id = &Apache::lonxml::get_param('id',$parstack,$safeeval);
     if ($id eq '') { $id = $Apache::lonxml::curdepth; }
     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_textfield {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$tagstack,$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="">';      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; }
       if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
         $result= '<textarea name="HWVAL'.$Apache::inputtags::response['-1'].'" '.
    "rows=\"$rows\" cols=\"$cols\">".$oldresponse;
       } else {
         $result='<table border="1"><tr><td><i>'.$oldresponse.'</i></td></tr></table>';
       }
       if ($oldresponse ne '') {
         #get rid of any startup text if the user has already responded
         &Apache::lonxml::get_all_text("/textfield",$$parser[-1]);
       }
     }
     if ($target eq 'grade') {
       my $seedtext=&Apache::lonxml::get_all_text("/textfield",$$parser[-1]);
       if ($seedtext eq $ENV{'form.HWVAL'.$Apache::inputtags::response[-1]}) {
         # if the seed text is still there it wasn't a real submission
         $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']}='';
       }
   }    }
   return $result;    return $result;
 }  }
   
 sub end_textarea {  sub end_textfield {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   if ($target eq 'web') {    if ($target eq 'web') {
     return "</textarea>";      if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
   }         return "</textarea>";
       }
     }
     &end_input;
   return '';    return '';
 }  }
   
 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; }
     $result= '<input type="text" name="HWVAL'.$Apache::inputtags::curvalue.'" value="" size="'.$size.'">';      my $partid=$Apache::inputtags::part;
       my $id=$Apache::inputtags::response['-1'];
       my $oldresponse = 
         $Apache::lonhomework::history{"resource.$partid.$id.submission"};
       if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
         $result= '<input type="text" name="HWVAL'.$id.'" value="'.
    $oldresponse.'" size="'.$size.'" />';
       } else {
         $result='<i>'.$oldresponse.'</i>';
       }
     } elsif ($target eq 'edit') {
       $result=&Apache::edit::tag_start($target,$token);
       $result.=&Apache::edit::text_arg('Size:','size',$token,'5')."</td></tr>";
       $result.=&Apache::edit::end_table;
     } elsif ($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 {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $id = &Apache::response::start_response($parstack,$safeeval);
     my $result;
     if ($target eq 'meta') {
       $result = &Apache::response::meta_stores_write($token->[2]->{'name'},
      $token->[2]->{'type'},
      $token->[2]->{'display'});
       $result .= &Apache::response::meta_package_write('datasubmission');
     }
     return $result;
 }  }
   
 sub end_datasubmission {  sub end_datasubmission {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   if ( $target == 'web' ) {    my $result;
     return '<input type="submit" name="submit" value="Submit All Data">';    if ( $target eq 'web' ) {
     } elsif ($target eq 'grade' ) {
       if ( defined $ENV{'form.submitted'}) {
         &Apache::response::setup_params('datasubmission');
         my $partid = $Apache::inputtags::part;
         my $id = $Apache::inputtags::response['-1'];
         my $response = $ENV{'form.HWVAL'.$id};
         my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
         if ( $response =~ /[^\s]/) {
    $Apache::lonhomework::results{"resource.$partid.$id.$name"}=
     $response;
         }
       }
   }    }
   return '';    &Apache::response::end_response;
     return $result;
 }  }
   
 sub finalizeawards {  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 '' ) {
       foreach $award (@_) { if ($award eq 'NO_RESPONSE') {$result='NO_RESPONSE'; last;} }
     }
   
   if ($result eq '' ) {    if ($result eq '' ) {
     foreach $award (@_) {       foreach $award (@_) { 
       if ($award eq 'UNIT_FAIL' ||        if ($award eq 'UNIT_FAIL' ||
Line 113  sub finalizeawards { Line 203  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 '' ) {
       foreach $award (@_) { if ($award eq 'SUBMITTED') {$result=$award; last;} }
     }
   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 {  sub decideoutput {
   my ($award)=@_;    my ($award,$solved,$previous)=@_;
   my $message='';    my $message='';
   my $button=0;    my $button=0;
   my $tries=0;    my $previousmsg;
   if      ($award eq 'EXACT_ANS' || $award eq 'APPROX_ANS' ) {  
     $message = "Yes, Computer gets: ";    if ($previous) { $previousmsg='You have entered that answer before'; }
     $tries=1; $button=0;  
         if      ($solved =~ /^correct/) {
       $message = "<b>You are correct.</b> Your receipt is ".
         &Apache::lonnet::receipt;
       $button=0;
       $previousmsg='';
     } elsif ($solved =~ /^excused/) {
       $message = "<b>You are excused from the problem.</b>";
       $button=0;
       $previousmsg='';
     } 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;
         $previousmsg='';
       }
     } 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";
     $tries=0; $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";
     $tries=0; $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";
     $tries=0; $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";
     $tries=0; $button=1;      $button=1;
   } elsif ($award eq 'NO_UNIT') {    } elsif ($award eq 'NO_UNIT') {
     $message = "Units required";      $message = "Units required";
     $tries=0; $button=1;      $button=1;
   } elsif ($award eq 'BAD_FORMULA') {    } elsif ($award eq 'BAD_FORMULA') {
     $message = "Unable to understand formula";      $message = "Unable to understand formula";
     $tries=0; $button=1;      $button=1;
   } elsif ($award eq 'INCORRECT') {    } elsif ($award eq 'INCORRECT') {
     $message = "Incorrect";      $message = "Incorrect";
     $tries=0; $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";
     $tries=0; $button=1;      $button=1;
   }    }
   return ($tries,$button,$message);    return ($button,$message,$previousmsg);
   }
   
   sub setgradedata {
     my ($award,$id,$previously_used) = @_;
     # if the student already has it correct, don't modify the status
     if ( $Apache::lonhomework::history{"resource.$id.solved"} !~
          /^correct/ ) {
       #handle assignment of tries and solved status
       if ( $award eq 'APPROX_ANS' || $award eq 'EXACT_ANS' ) {
         $Apache::lonhomework::results{"resource.$id.tries"} =
    $Apache::lonhomework::history{"resource.$id.tries"} + 1;
         $Apache::lonhomework::results{"resource.$id.solved"} =
    'correct_by_student';
         $Apache::lonhomework::results{"resource.$id.awarded"} = '1';
       } elsif ( $award eq 'INCORRECT' ) {
         $Apache::lonhomework::results{"resource.$id.tries"} =
    $Apache::lonhomework::history{"resource.$id.tries"} + 1;
         $Apache::lonhomework::results{"resource.$id.solved"} =
    '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';
       } elsif ( $award eq 'NO_RESPONSE' ) {
         return '';
       } else {
         $Apache::lonhomework::results{"resource.$id.solved"} =
    'incorrect_attempted';
       }
   
       # check if this was a previous submission if it was delete the
       # unneeded data and update the previously_used attribute
       if ( $previously_used eq 'PREVIOUSLY_USED') {
         delete($Apache::lonhomework::results{"resource.$id.tries"});
         $Apache::lonhomework::results{"resource.$id.previous"} = '1';
       } elsif ( $previously_used eq 'PREVIOUSLY_LAST') {
         #delete all data as they student didn't do anything
         foreach my $key (keys(%Apache::lonhomework::results)) {
    if ($key =~ /^resource\.$id\./) {
     &Apache::lonxml::debug("Removing $key");
     delete($Apache::lonhomework::results{$key});
    }
         }
         #and since they didn't do anything we were never here
         return '';
       } else {
         $Apache::lonhomework::results{"resource.$id.previous"} = '0';
       }
     }
     $Apache::lonhomework::results{"resource.$id.award"} = $award;
 }  }
   
 sub grade {  sub grade {
   my ($target) = @_;    my ($target) = @_;
   my $id = $Apache::inputtags::part;    my $id = $Apache::inputtags::part;
   my $result='';  
   my $button='<input type="submit" name="submit" value="Submit All Answers">';  
   my $response='';    my $response='';
   if ( $target == 'web' ) {    if ( defined $ENV{'form.submitted'}) {
     if ( defined $ENV{'form.submit'}) {      my @awards = ();
       my @awards = ();      foreach $response (@Apache::inputtags::responselist) {
       &Apache::lonxml::debug("$#Apache::inputtags::responselist");        &Apache::lonxml::debug("looking for response.$id.$response.awarddetail");
       foreach $response (@Apache::inputtags::responselist) {        my $value=$Apache::lonhomework::results{"resource.$id.$response.awarddetail"};
  &Apache::lonxml::debug("looking for response.awarddetail.$id.$response");        if ( $value ne '' ) {
  my $value=$Apache::lonhomework::results{"resource.awarddetail.$id.$response"};   &Apache::lonxml::debug("keeping $value from $response for $id");
  if ( $value ne '' ) {   push (@awards,$value);
   &Apache::lonxml::debug("keep ing $value from $response for $id");        } else {
   push (@awards,$value);   &Apache::lonxml::debug("skipping $value from $response for $id");
  } else {        }
   &Apache::lonxml::debug("skipping $value from $response for $id");      }
       my $finalaward = &finalizeawards(@awards);
       my $previously_used;
       if ( $#Apache::inputtags::previous eq $#awards ) {
         $previously_used = 'PREVIOUSLY_LAST';
         foreach my $value (@Apache::inputtags::previous) {
    if ($value eq 'PREVIOUSLY_USED' ) {
     $previously_used = $value;
     last;
  }   }
       }        }
       my $finalaward = &finalizeawards(@awards);  
       my ($triesinc,$showbutton,$message) = &decideoutput($finalaward);  
       $Apache::lonhomework::results{"resource.tries.$id"} =  
  $Apache::lonhomework::history{"resource.tries.$id"} + 1;  
       &Apache::lonxml::debug("final award $finalaward");  
     }      }
     if ($showbutton > 0) { $result.=$button }      &Apache::lonxml::debug("final award $finalaward, $previously_used");
       &setgradedata($finalaward,$id,$previously_used);
   }    }
   return $result;    return '';
 }  }
   
   sub gradestatus {
     my ($id) = @_;
     my $showbutton = 1;
     my $message = '';
     my $trystr='';
     my $button='';
     my $previousmsg='';
   
     my $status = $Apache::inputtags::status['-1'];
     &Apache::lonxml::debug("gradestatus has :$status:");
     if ( $status ne 'CLOSED' ) {  
       my $award = $Apache::lonhomework::history{"resource.$id.award"};
       my $solved = $Apache::lonhomework::history{"resource.$id.solved"};
       my $previous = $Apache::lonhomework::history{"resource.$id.previous"};
       &Apache::lonxml::debug("Found Award |$award|$solved|");
       if ( $award ne '' ) {
         &Apache::lonxml::debug('Getting message');
         ($showbutton,$message,$previousmsg) =
    &decideoutput($award,$solved,$previous);
         $message="<td bgcolor=\"#aaffaa\">$message</td>";
         if ($previousmsg) {
    $previousmsg="<td bgcolor=\"#ffaaaa\">$previousmsg</td>";
         }
       }
       my $tries = $Apache::lonhomework::history{"resource.$id.tries"};
       my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries");
       &Apache::lonxml::debug("got maxtries of :$maxtries:");
       if ( $tries eq '' ) { $tries = '0'; }
       if ( $maxtries eq '' ) { $maxtries = '2'; } 
       if ( $maxtries eq 'con_lost' ) { $maxtries = '0'; } 
       if ( $showbutton ) {
         $trystr = "<td>Tries $tries/$maxtries</td>";
       }
       if ( $status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {$showbutton = 0;}
       if ( $showbutton ) { 
         $button = '<br /><input type="submit" name="submit" value="Submit Answer" />';
       }
     }
     my $output= $previousmsg.$message.$trystr;
     if ($output =~ /^\s*$/) {
       return $button;
     } else {
       return $button.'<table><tr>'.$previousmsg.$message.$trystr.'</tr></table>';
     }
   }
 1;  1;
 __END__  __END__
     

Removed from v.1.10  
changed lines
  Added in v.1.52


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