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

Diff for /loncom/homework/inputtags.pm between versions 1.46 and 1.54

version 1.46, 2001/11/12 20:27:28 version 1.54, 2002/03/08 19:55:00
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 strict;  use strict;
   
 sub BEGIN {  BEGIN {
   &Apache::lonxml::register('Apache::inputtags',('textarea','textline','datasubmission'));    &Apache::lonxml::register('Apache::inputtags',('textfield','textline','datasubmission'));
 }  }
   
   
Line 46  sub end_input { Line 71  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);
Line 64  sub start_textarea { Line 89  sub start_textarea {
     }      }
     if ($oldresponse ne '') {      if ($oldresponse ne '') {
       #get rid of any startup text if the user has already responded        #get rid of any startup text if the user has already responded
       &Apache::lonxml::get_all_text("/textarea",$$parser[$#$parser]);        &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,$tagstack,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   if ($target eq 'web') {    if ($target eq 'web') {
     if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {      if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
Line 98  sub start_textline { Line 130  sub start_textline {
       $result='<i>'.$oldresponse.'</i>';        $result='<i>'.$oldresponse.'</i>';
     }      }
   } elsif ($target eq 'edit') {    } elsif ($target eq 'edit') {
     $result=&Apache::edit::tag_start($target,$token,      $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::text_arg('Size:','size',$token,'5')."</td></tr>";
     $result.=&Apache::edit::end_table;      $result.=&Apache::edit::end_table;
   } elsif ($target eq 'modified') {    } elsif ($target eq 'modified') {
Line 154  sub finalizeawards { Line 185  sub finalizeawards {
   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 '' ) {    if ($result eq '' ) {
     foreach $award (@_) { if ($award eq 'ERROR') {$result='ERROR'; last;}}      foreach $award (@_) { if ($award eq 'ERROR') {$result='ERROR'; last;}}
Line 261  sub decideoutput { Line 299  sub decideoutput {
 sub setgradedata {  sub setgradedata {
   my ($award,$id,$previously_used) = @_;    my ($award,$id,$previously_used) = @_;
   # if the student already has it correct, don't modify the status    # if the student already has it correct, don't modify the status
   if ( $Apache::lonhomework::history{"resource.$id.solved"} !~    if ($Apache::inputtags::status['-1'] ne 'CAN_ANSWER') {
       $Apache::lonhomework::results{"resource.$id.afterduedate"}=$award;
       return '';
     } elsif ( $Apache::lonhomework::history{"resource.$id.solved"} !~
        /^correct/ ) {         /^correct/ ) {
     #handle assignment of tries and solved status      #handle assignment of tries and solved status
       if ($Apache::lonhomework::history{"resource.$id.afterduedate"}) {
         $Apache::lonhomework::results{"resource.$id.afterduedate"}='';
       }
     if ( $award eq 'APPROX_ANS' || $award eq 'EXACT_ANS' ) {      if ( $award eq 'APPROX_ANS' || $award eq 'EXACT_ANS' ) {
       $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;
Line 318  sub grade { Line 362  sub grade {
     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 '' ) {        &Apache::lonxml::debug("keeping $value from $response for $id");
  &Apache::lonxml::debug("keeping $value from $response for $id");        push (@awards,$value);
  push (@awards,$value);  
       } else {  
  &Apache::lonxml::debug("skipping $value from $response for $id");  
       }  
     }      }
     my $finalaward = &finalizeawards(@awards);      my $finalaward = &finalizeawards(@awards);
     my $previously_used;      my $previously_used;
Line 346  sub gradestatus { Line 386  sub gradestatus {
   my ($id) = @_;    my ($id) = @_;
   my $showbutton = 1;    my $showbutton = 1;
   my $message = '';    my $message = '';
     my $latemessage = '';
   my $trystr='';    my $trystr='';
   my $button='';    my $button='';
   my $previousmsg='';    my $previousmsg='';
Line 377  sub gradestatus { Line 418  sub gradestatus {
     }      }
     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" />';        $button = '<br /><input type="submit" name="submit" value="Submit Answer" />';
       }
       if ($Apache::lonhomework::history{"resource.$id.afterduedate"}) {
         #last submissions was after due date
         $latemessage="<td bgcolor=\"#ffaaaa\">The last submission was after the Due Date</td>";
     }      }
   }    }
   my $output= $previousmsg.$message.$trystr;    my $output= $previousmsg.$latemessage.$message.$trystr;
   if ($output =~ /^\s*$/) {    if ($output =~ /^\s*$/) {
     return $button;      return $button;
   } else {    } else {
     return $button.'<table><tr>'.$previousmsg.$message.$trystr.'</tr></table>';      return $button.'<table><tr>'.$output.'</tr></table>';
   }    }
 }  }
 1;  1;
Removed from v.1.46  
changed lines
  Added in v.1.54

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