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

Diff for /loncom/homework/inputtags.pm between versions 1.48 and 1.53

version 1.48, 2002/01/08 21:09:23 version 1.53, 2002/03/01 00:23:04
Line 30 Line 30
 package Apache::inputtags;  package Apache::inputtags;
 use strict;  use strict;
   
 sub BEGIN {  BEGIN {
   &Apache::lonxml::register('Apache::inputtags',('textfield','textline','datasubmission'));    &Apache::lonxml::register('Apache::inputtags',('textfield','textline','datasubmission'));
 }  }
   
Line 89  sub start_textfield { Line 89  sub start_textfield {
     }      }
     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("/textfield",$$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;
Line 123  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 286  sub decideoutput { Line 292  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 371  sub gradestatus { Line 383  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 402  sub gradestatus { Line 415  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.48  
changed lines
  Added in v.1.53

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