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

Diff for /loncom/homework/inputtags.pm between versions 1.55 and 1.59

version 1.55, 2002/03/11 21:37:55 version 1.59, 2002/08/01 15:18:58
Line 78  sub start_textfield { Line 78  sub start_textfield {
   my $id = &start_input($parstack,$safeeval);    my $id = &start_input($parstack,$safeeval);
   my $resid=$Apache::inputtags::response[-1];    my $resid=$Apache::inputtags::response[-1];
   if ($target eq 'web') {    if ($target eq 'web') {
       $Apache::lonxml::evaluate--;
     my $partid=$Apache::inputtags::part;      my $partid=$Apache::inputtags::part;
     my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$resid.submission"});      my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$resid.submission"});
     my $cols = &Apache::lonxml::get_param('cols',$parstack,$safeeval);      my $cols = &Apache::lonxml::get_param('cols',$parstack,$safeeval);
Line 108  sub start_textfield { Line 109  sub start_textfield {
 sub end_textfield {  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') {
       $Apache::lonxml::evaluate++;
     if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {      if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
       return "</textarea>";        return "</textarea>";
     }      }
Line 120  sub start_textline { Line 122  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') {
       $Apache::lonxml::evaluate--;
     my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval);      my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval);
     if ($size eq '') { $size=20; }      if ($size eq '') { $size=20; }
     my $partid=$Apache::inputtags::part;      my $partid=$Apache::inputtags::part;
Line 144  sub start_textline { Line 147  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 "";
 }  }
   
Line 197  sub finalizeawards { Line 201  sub finalizeawards {
     if ($blankcount == ($#_ + 1)) { $result = 'NO_RESPONSE'; }      if ($blankcount == ($#_ + 1)) { $result = 'NO_RESPONSE'; }
   }    }
   if ($result eq '' ) {    if ($result eq '' ) {
       foreach $award (@_) { if ($award eq 'MISSING_ANSWER') {$result='MISSING_ANSWER'; last;}}
     }
     if ($result eq '' ) {
     foreach $award (@_) { if ($award eq 'ERROR') {$result='ERROR'; last;}}      foreach $award (@_) { if ($award eq 'ERROR') {$result='ERROR'; last;}}
   }    }
   if ($result eq '' ) {    if ($result eq '' ) {
Line 225  sub finalizeawards { Line 232  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 291  sub decideoutput { Line 301  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;
Line 320  sub setgradedata { Line 333  sub setgradedata {
       $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"} =
  'incorrect_attempted';   'incorrect_attempted'
     } elsif ( $award eq 'SUBMITTED' ) {      } 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"} =
  'ungraded_attempted';   'ungraded_attempted';
       } elsif ( $award eq 'DRAFT' ) {
         $Apache::lonhomework::results{"resource.$id.solved"} = '';
     } elsif ( $award eq 'NO_RESPONSE' ) {      } elsif ( $award eq 'NO_RESPONSE' ) {
       return '';        return '';
     } else {      } else {
Line 339  sub setgradedata { Line 354  sub setgradedata {
       delete($Apache::lonhomework::results{"resource.$id.tries"});        delete($Apache::lonhomework::results{"resource.$id.tries"});
       $Apache::lonhomework::results{"resource.$id.previous"} = '1';        $Apache::lonhomework::results{"resource.$id.previous"} = '1';
     } elsif ( $previously_used eq 'PREVIOUSLY_LAST') {      } elsif ( $previously_used eq 'PREVIOUSLY_LAST') {
       #delete all data as they student didn't do anything        #delete all data as they student didn't do anything, but save
         #the list of collaborators.
       foreach my $key (keys(%Apache::lonhomework::results)) {        foreach my $key (keys(%Apache::lonhomework::results)) {
  if ($key =~ /^resource\.$id\./) {   if (($key =~ /^resource\.$id\./) && ($key !~ /\.collaborators$/)) {
   &Apache::lonxml::debug("Removing $key");    &Apache::lonxml::debug("Removing $key");
   delete($Apache::lonhomework::results{$key});    delete($Apache::lonhomework::results{$key});
  }   }
Removed from v.1.55  
changed lines
  Added in v.1.59

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