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

version 1.38, 2001/07/13 14:02:35 version 1.65, 2002/10/08 18:04:04
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   # 2/19 Guy 
   
 package Apache::inputtags;  package Apache::inputtags;
   use HTML::Entities();
 use strict;  use strict;
   
 sub BEGIN {  BEGIN {
   &Apache::lonxml::register('Apache::inputtags',('textarea','textline','datasubmission'));    &Apache::lonxml::register('Apache::inputtags',('textfield','textline'));
 }  }
   
   
Line 17  sub initialize_inputtags { Line 43  sub initialize_inputtags {
   @Apache::inputtags::inputlist=();    @Apache::inputtags::inputlist=();
   # list of all current response ids    # list of all current response ids
   @Apache::inputtags::response=();    @Apache::inputtags::response=();
   #list of all response ids seen in this problem    # list of all response ids seen in this problem
   @Apache::inputtags::responselist=();    @Apache::inputtags::responselist=();
     # 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    # 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>     # list of problem date statuses, the first element is for <problem>
   #if there is a second element it is for the current <part>    # 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    # 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 {  sub start_input {
Line 42  sub end_input { Line 72  sub end_input {
   return '';    return '';
 }  }
   
 sub start_textarea {  sub start_textfield {
   my ($target,$token,$tagstack,$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);
     my $resid=$Apache::inputtags::response[-1];
   if ($target eq 'web') {    if ($target eq 'web') {
     my $oldresponse = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.$Apache::inputtags::response['-1'].submission"};      $Apache::lonxml::evaluate--;
     my $cols = &Apache::lonxml::get_param('cols',$parstack,$safeeval);      if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
     if ( $cols eq '') { $cols = 80; }   my $partid=$Apache::inputtags::part;
     my $rows = &Apache::lonxml::get_param('rows',$parstack,$safeeval);   my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$resid.submission"});
     if ( $rows eq '') { $rows = 10; }   my $cols = &Apache::lonxml::get_param('cols',$parstack,$safeeval);
     $result= '<textarea name="HWVAL'.$Apache::inputtags::response['-1'].'" '.   if ( $cols eq '') { $cols = 80; }
       "rows=\"$rows\" cols=\"$cols\">".$oldresponse;   my $rows = &Apache::lonxml::get_param('rows',$parstack,$safeeval);
     if ($oldresponse ne '') {   if ( $rows eq '') { $rows = 10; }
       #get rid of any startup text if the user has already responded   $result= '<textarea name="HWVAL'.$resid.'" '.
       &Apache::lonxml::get_all_text("/textarea",$$parser[$#$parser]);      "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("/textfield",$$parser[-1]);
    }
       } else {
    #right or wrong don't show it
    #$result='<table border="1"><tr><td><i>'.$oldresponse.'</i></td></tr></table>';
    $result='';
    #get rid of any startup text
    &Apache::lonxml::get_all_text("/textfield",$$parser[-1]);
     }      }
     } elsif ($target eq 'grade') {
       my $seedtext=&Apache::lonxml::get_all_text("/textfield",$$parser[-1]);
       if ($seedtext eq $ENV{'form.HWVAL'.$resid}) {
         # if the seed text is still there it wasn't a real submission
         $ENV{'form.HWVAL'.$resid}='';
       }
     } elsif ($target eq 'edit') {
       $result.=&Apache::edit::tag_start($target,$token);
       $result.=&Apache::edit::text_arg('Rows:','rows',$token,4);
       $result.=&Apache::edit::text_arg('Columns:','cols',$token,4);
       my $bodytext=&Apache::lonxml::get_all_text("/textfield",$$parser[-1]);
       $result.=&Apache::edit::editfield($token->[1],$bodytext,'Text you want to appear by default:',80,2);
     } elsif ($target eq 'modified') {
       my $constructtag=&Apache::edit::get_new_args($token,$parstack,
    $safeeval,'rows','cols');
       if ($constructtag) {
         $result = &Apache::edit::rebuild_tag($token);
       } else {
         $result=$token->[4];
       }
       $result.=&Apache::edit::modifiedfield();
   }    }
   return $result;    return $result;
 }  }
   
 sub end_textarea {  sub end_textfield {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result;
   if ($target eq 'web') {    if ($target eq 'web') {
     return "</textarea>";      $Apache::lonxml::evaluate++;
   }       if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
         return "</textarea>";
       }
     } elsif ($target eq 'edit') {
       $result=&Apache::edit::end_table();
     }
   &end_input;    &end_input;
   return '';    return $result;
 }  }
   
 sub start_textline {  sub start_textline {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   my $result = "";    my $result = "";
   if ($target eq 'web') {    if ($target eq 'web') {
     my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval);      $Apache::lonxml::evaluate--;
     if ($size eq '') { $size=20; }      if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
     my $oldresponse = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.$Apache::inputtags::response['-1'].submission"};        my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval);
     $result= '<input type="text" name="HWVAL'.$Apache::inputtags::response['-1'].'" value="'.$oldresponse.'" size="'.$size.'" />';        if ($size eq '') { $size=20; }
   }        my $partid=$Apache::inputtags::part;
   if ($target eq 'edit') {        my $id=$Apache::inputtags::response[-1];
     $result.=&Apache::edit::tag_start($target,$token,&Apache::lonxml::description($token));        my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$id.submission"});
         $result= '<input type="text" name="HWVAL'.$id.'" value="'.
    $oldresponse.'" size="'.$size.'" />';
       } else {
         #right or wrong don't show what was last typed in.
         #$result='<i>'.$oldresponse.'</i>';
         $result='';
       }
     } 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::text_arg('Size:','size',$token,'5')."</td></tr>";
     $result.=&Apache::edit::end_table;      $result.=&Apache::edit::end_table;
   }    } elsif ($target eq 'modified') {
   if ($target eq 'modified') {  
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'size');      my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'size');
     if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }      if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
   }    }
Line 94  sub start_textline { Line 170  sub start_textline {
   
 sub end_textline {  sub end_textline {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   if ($target eq 'edit') { return ('','no'); }    if    ($target eq 'web') { $Apache::lonxml::evaluate++; }
     elsif ($target eq 'edit') { return ('','no'); }
   return "";    return "";
 }  }
   
 sub start_datasubmission {  
   return '';  
 }  
   
 sub end_datasubmission {  
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;  
   if ( $target == 'web' ) {  
     return '<input type="submit" name="submit" value="Submit All Data" />';  
   }  
   return '';  
 }  
   
 sub finalizeawards {  sub finalizeawards {
   my $result='';    my $result='';
   my $award;    my $award;
   if ($#_ == '-1') { $result = "NO_RESPONSE"; }    if ($#_ == '-1') { $result = "NO_RESPONSE"; }
   if ($result eq '' ) {    if ($result eq '' ) {
     foreach $award (@_) { if ($award eq '') {$result='MISSING_ANSWER'; last;}}      my $blankcount;
       foreach $award (@_) {
         if ($award eq '') {
    $result='MISSING_ANSWER';
    $blankcount++;
         }
       }
       if ($blankcount == ($#_ + 1)) { $result = 'NO_RESPONSE'; }
     }
     if ($result eq '' ) {
       foreach $award (@_) { if ($award eq 'MISSING_ANSWER') {$result='MISSING_ANSWER'; last;}}
   }    }
   if ($result eq '' ) {    if ($result eq '' ) {
     foreach $award (@_) { if ($award eq 'ERROR') {$result='ERROR'; last;}}      foreach $award (@_) { if ($award eq 'ERROR') {$result='ERROR'; last;}}
Line 146  sub finalizeawards { Line 221  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 'DRAFT') {$result=$award; last;} }
     }
     if ($result eq '' ) {
     foreach $award (@_) { if ($award eq 'SUBMITTED') {$result=$award; last;} }      foreach $award (@_) { if ($award eq 'SUBMITTED') {$result=$award; last;} }
   }    }
   if ($result eq '' ) {    if ($result eq '' ) {
Line 156  sub finalizeawards { Line 234  sub finalizeawards {
 }  }
   
 sub decideoutput {  sub decideoutput {
   my ($award,$solved)=@_;    my ($award,$solved,$previous)=@_;
   my $message='';    my $message='';
   my $button=0;    my $button=0;
     my $previousmsg;
   
     if ($previous) { $previousmsg='You have entered that answer before'; }
   
   if      ($solved =~ /^correct/) {    if      ($solved =~ /^correct/) {
     $message = "<b>You are correct.</b> Your receipt is ".      $message = "<b>You are correct.</b> Your receipt is ".
       &Apache::lonnet::receipt;        &Apache::lonnet::receipt;
     $button=0;      $button=0;
       $previousmsg='';
   } elsif ($solved =~ /^excused/) {    } elsif ($solved =~ /^excused/) {
     $message = "<b>You are excused from the problem.</b>";      $message = "<b>You are excused from the problem.</b>";
     $button=0;      $button=0;
       $previousmsg='';
   } elsif ($award eq 'EXACT_ANS' || $award eq 'APPROX_ANS' ) {    } elsif ($award eq 'EXACT_ANS' || $award eq 'APPROX_ANS' ) {
     if ($solved =~ /^incorrect/ || $solved eq '') {      if ($solved =~ /^incorrect/ || $solved eq '') {
       $message = "Incorrect";        $message = "Incorrect";
Line 174  sub decideoutput { Line 258  sub decideoutput {
       $message = "<b>You are correct.</b> Your receipt is ".        $message = "<b>You are correct.</b> Your receipt is ".
  &Apache::lonnet::receipt;   &Apache::lonnet::receipt;
       $button=0;        $button=0;
         $previousmsg='';
     }      }
   } elsif ($award eq 'NO_RESPONSE') {    } elsif ($award eq 'NO_RESPONSE') {
     $message = '';      $message = '';
Line 205  sub decideoutput { Line 290  sub decideoutput {
   } elsif ($award eq 'SUBMITTED') {    } elsif ($award eq 'SUBMITTED') {
     $message = "Your submission has been recorded.";      $message = "Your submission has been recorded.";
     $button=1;      $button=1;
     } elsif ($award eq 'DRAFT') {
       $message = "A draft copy has been saved.";
       $button=1;
   } else {    } else {
     $message = "Unknown message: $award";      $message = "Unknown message: $award";
     $button=1;      $button=1;
   }    }
   return ($button,$message);    return ($button,$message,$previousmsg);
 }  }
   
 sub setgradedata {  sub setgradedata {
   my ($award,$id) = @_;    my ($award,$id,$previously_used) = @_;
   if ( $award eq 'APPROX_ANS' || $award eq 'EXACT_ANS' ) {    # if the student already has it correct, don't modify the status
     $Apache::lonhomework::results{"resource.$id.tries"} =    if ($Apache::inputtags::status['-1'] ne 'CAN_ANSWER') {
       $Apache::lonhomework::history{"resource.$id.tries"} + 1;      $Apache::lonhomework::results{"resource.$id.afterduedate"}=$award;
     $Apache::lonhomework::results{"resource.$id.solved"} =      return '';
       'correct_by_student';    } elsif ( $Apache::lonhomework::history{"resource.$id.solved"} !~
     $Apache::lonhomework::results{"resource.$id.awarded"} = '1';         /^correct/ ) {
   } elsif ( $award eq 'INCORRECT' ) {      #handle assignment of tries and solved status
     $Apache::lonhomework::results{"resource.$id.tries"} =      if ($Apache::lonhomework::history{"resource.$id.afterduedate"}) {
       $Apache::lonhomework::history{"resource.$id.tries"} + 1;        $Apache::lonhomework::results{"resource.$id.afterduedate"}='';
     $Apache::lonhomework::results{"resource.$id.solved"} =      }
       'incorrect_attempted';      if ( $award eq 'APPROX_ANS' || $award eq 'EXACT_ANS' ) {
   } elsif ( $award eq 'SUBMITTED' ) {        $Apache::lonhomework::results{"resource.$id.tries"} =
     $Apache::lonhomework::results{"resource.$id.tries"} =   $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"} =   'correct_by_student';
       'ungraded_attempted';        $Apache::lonhomework::results{"resource.$id.awarded"} = '1';
   } else {      } elsif ( $award eq 'INCORRECT' ) {
     $Apache::lonhomework::results{"resource.$id.solved"} =        $Apache::lonhomework::results{"resource.$id.tries"} =
       'incorrect_attempted';   $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 'DRAFT' ) {
         $Apache::lonhomework::results{"resource.$id.solved"} = '';
       } 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, but save
         #the list of collaborators.
         foreach my $key (keys(%Apache::lonhomework::results)) {
    if (($key =~ /^resource\.$id\./) && ($key !~ /\.collaborators$/)) {
     &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;    $Apache::lonhomework::results{"resource.$id.award"} = $award;
 }  }
Line 240  sub setgradedata { Line 363  sub setgradedata {
 sub grade {  sub grade {
   my ($target) = @_;    my ($target) = @_;
   my $id = $Apache::inputtags::part;    my $id = $Apache::inputtags::part;
 #  my $result='';  
   my $response='';    my $response='';
   if ( $target == 'web' ) {    if ( defined $ENV{'form.submitted'}) {
     if ( defined $ENV{'form.submitted'}) {      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.$id.$response.awarddetail");        &Apache::lonxml::debug("keeping $value from $response for $id");
  my $value=$Apache::lonhomework::results{"resource.$id.$response.awarddetail"};        push (@awards,$value);
  if ( $value ne '' ) {      }
   &Apache::lonxml::debug("keeping $value from $response for $id");      my $finalaward = &finalizeawards(@awards);
   push (@awards,$value);      my $previously_used;
  } else {      if ( $#Apache::inputtags::previous eq $#awards ) {
   &Apache::lonxml::debug("skipping $value from $response for $id");        $previously_used = 'PREVIOUSLY_LAST';
         foreach my $value (@Apache::inputtags::previous) {
    if ($value eq 'PREVIOUSLY_USED' ) {
     $previously_used = $value;
     last;
  }   }
       }        }
       my $finalaward = &finalizeawards(@awards);  
       &Apache::lonxml::debug("final award $finalaward");  
       &setgradedata($finalaward,$id);  
     }      }
       &Apache::lonxml::debug("final award $finalaward, $previously_used");
       &setgradedata($finalaward,$id,$previously_used);
   }    }
   return '';    return '';
 }  }
   
 sub gradestatus {  sub gradestatus {
   my ($id) = @_;    my ($id,$target) = @_;
   my $showbutton = 1;    my $showbutton = 1;
   my $message = '';    my $message = '';
     my $latemessage = '';
   my $trystr='';    my $trystr='';
   my $button='';    my $button='';
       my $previousmsg='';
   
   my $status = $Apache::inputtags::status['-1'];    my $status = $Apache::inputtags::status['-1'];
   &Apache::lonxml::debug("gradestatus has :$status:");    &Apache::lonxml::debug("gradestatus has :$status:");
   if ( $status ne 'CLOSED' ) {      if ( $status ne 'CLOSED' ) {  
     my $award = $Apache::lonhomework::history{"resource.$id.award"};      my $award = $Apache::lonhomework::history{"resource.$id.award"};
     my $solved = $Apache::lonhomework::history{"resource.$id.solved"};      my $solved = $Apache::lonhomework::history{"resource.$id.solved"};
       my $previous = $Apache::lonhomework::history{"resource.$id.previous"};
     &Apache::lonxml::debug("Found Award |$award|$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,$solved);        ($showbutton,$message,$previousmsg) =
       $message="<br /><table bgcolor=\"#aaffaa\"><tr><td>$message</td></tr></table>";   &decideoutput($award,$solved,$previous);
         if ($target eq 'tex') {
    $message=' '.$message.' ';
         } else {
    $message="<td bgcolor=\"#aaffaa\">$message</td>";
    if ($previousmsg) {
     $previousmsg="<td bgcolor=\"#ffaaaa\">$previousmsg</td>";
    }
         }
     }      }
     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");
Line 289  sub gradestatus { Line 425  sub gradestatus {
     if ( $maxtries eq '' ) { $maxtries = '2'; }       if ( $maxtries eq '' ) { $maxtries = '2'; } 
     if ( $maxtries eq 'con_lost' ) { $maxtries = '0'; }       if ( $maxtries eq 'con_lost' ) { $maxtries = '0'; } 
     if ( $showbutton ) {      if ( $showbutton ) {
       $trystr = "<br />Tries $tries/$maxtries";        if ($target eq 'tex') {
    $trystr = ' Tries '.$tries.'/'.$maxtries.' ';
         } else {
            $trystr = "<td>Tries $tries/$maxtries</td>";
         }
     }      }
     if ( $status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {$showbutton = 0;}      if ( $status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {$showbutton = 0;}
     if ( $showbutton ) {       if ( $showbutton ) { 
       $button = '<br /><input type="submit" name="submit" value="Submit All Answers" />';        if ($target ne 'tex') {
           $button = '<br /><input type="submit" name="submit" value="Submit Answer" />';
         }
       }
       if ($Apache::lonhomework::history{"resource.$id.afterduedate"}) {
         #last submissions was after due date
         if ($target eq 'tex') {
     $latemessage=' The last submission was after the Due Date ';
         } else {
           $latemessage="<td bgcolor=\"#ffaaaa\">The last submission was after the Due Date</td>";
         }
       }
     }
     my $output= $previousmsg.$latemessage.$message.$trystr;
     if ($output =~ /^\s*$/) {
       return $button;
     } else {
       if ($target eq 'tex') {
         return $button.' \vskip 0 mm '.$output.' ';
       } else {
         return $button.'<table><tr>'.$output.'</tr></table>';
     }      }
   }    }
   return $button.$message.$trystr;  
 }  }
 1;  1;
 __END__  __END__

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


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