Diff for /loncom/homework/inputtags.pm between versions 1.124 and 1.124.2.1

version 1.124, 2003/11/25 23:04:58 version 1.124.2.1, 2004/02/06 22:39:56
Line 500  sub removealldata { Line 500  sub removealldata {
 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::inputtags::status['-1'] ne 'CAN_ANSWER' &&    if (!$Apache::lonhomework::scantronmode &&
         $Apache::inputtags::status['-1'] ne 'CAN_ANSWER' &&
       $Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER') {        $Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER') {
     $Apache::lonhomework::results{"resource.$id.afterduedate"}=$award;      $Apache::lonhomework::results{"resource.$id.afterduedate"}=$award;
     return '';      return '';
Line 567  sub setgradedata { Line 568  sub setgradedata {
       }        }
     }      }
   
     # check if this was a previous submission if it was delete the      # did either of the overall awards chage? If so ignore the 
     # unneeded data and update the previously_used attribute      # previous check
     if ( $previously_used eq 'PREVIOUSLY_USED') {      if (($Apache::lonhomework::results{"resource.$id.awarded"} eq
  if (lc($Apache::lonhomework::problemstatus) ne 'no') {   $Apache::lonhomework::history{"resource.$id.awarded"}) &&
     delete($Apache::lonhomework::results{"resource.$id.tries"});          ($Apache::lonhomework::results{"resource.$id.solved"} eq
     $Apache::lonhomework::results{"resource.$id.previous"} = '1';           $Apache::lonhomework::history{"resource.$id.solved"})) {
    # 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') {
       if (lc($Apache::lonhomework::problemstatus) ne 'no') {
    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.
       &removealldata($id);
       #and since they didn't do anything we were never here
       return '';
    } else {
       $Apache::lonhomework::results{"resource.$id.previous"} = '0';
  }   }
     } elsif ( $previously_used eq 'PREVIOUSLY_LAST') {  
       #delete all data as they student didn't do anything, but save  
       #the list of collaborators.  
       &removealldata($id);  
       #and since they didn't do anything we were never here  
       return '';  
     } else {  
       $Apache::lonhomework::results{"resource.$id.previous"} = '0';  
     }      }
   } elsif ( $Apache::lonhomework::history{"resource.$id.solved"} =~    } elsif ( $Apache::lonhomework::history{"resource.$id.solved"} =~
     /^correct/ ) {      /^correct/ ) {

Removed from v.1.124  
changed lines
  Added in v.1.124.2.1


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