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

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

version 1.124.2.1, 2004/02/06 22:39:56 version 1.127, 2004/01/28 21:42:51
Line 24 Line 24
 # /home/httpd/html/adm/gpl.txt  # /home/httpd/html/adm/gpl.txt
 #  #
 # http://www.lon-capa.org/  # http://www.lon-capa.org/
 #  
 # 2/19 Guy   
   
 package Apache::inputtags;  package Apache::inputtags;
 use HTML::Entities();  use HTML::Entities();
Line 480  sub decideoutput { Line 478  sub decideoutput {
   }    }
   if (lc($Apache::lonhomework::problemstatus) eq 'no'  &&     if (lc($Apache::lonhomework::problemstatus) eq 'no'  && 
       $Apache::inputtags::status[-1] ne 'SHOW_ANSWER') {        $Apache::inputtags::status[-1] ne 'SHOW_ANSWER') {
       $message = &mt("Answer Submitted");        $message = &mt("Answer Submitted: Your final submission will be graded after the due date.");
       $bgcolor=$possiblecolors{'correct'};        $bgcolor=$possiblecolors{'correct'};
       $button=1;        $button=1;
   }    }
Line 500  sub removealldata { Line 498  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::lonhomework::scantronmode &&    if ($Apache::inputtags::status['-1'] ne 'CAN_ANSWER' &&
       $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 568  sub setgradedata { Line 565  sub setgradedata {
       }        }
     }      }
   
     # did either of the overall awards chage? If so ignore the       # check if this was a previous submission if it was delete the
     # previous check      # unneeded data and update the previously_used attribute
     if (($Apache::lonhomework::results{"resource.$id.awarded"} eq      if ( $previously_used eq 'PREVIOUSLY_USED') {
  $Apache::lonhomework::history{"resource.$id.awarded"}) &&   if (lc($Apache::lonhomework::problemstatus) ne 'no') {
         ($Apache::lonhomework::results{"resource.$id.solved"} eq      delete($Apache::lonhomework::results{"resource.$id.tries"});
          $Apache::lonhomework::history{"resource.$id.solved"})) {      $Apache::lonhomework::results{"resource.$id.previous"} = '1';
  # check if this was a previous submission if it was delete the   }
  # unneeded data and update the previously_used attribute      } elsif ( $previously_used eq 'PREVIOUSLY_LAST') {
  if ( $previously_used eq 'PREVIOUSLY_USED') {        #delete all data as they student didn't do anything, but save
     if (lc($Apache::lonhomework::problemstatus) ne 'no') {        #the list of collaborators.
  delete($Apache::lonhomework::results{"resource.$id.tries"});        &removealldata($id);
  $Apache::lonhomework::results{"resource.$id.previous"} = '1';        #and since they didn't do anything we were never here
     }        return '';
  } elsif ( $previously_used eq 'PREVIOUSLY_LAST') {      } else {
     #delete all data as they student didn't do anything, but save        $Apache::lonhomework::results{"resource.$id.previous"} = '0';
     #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/ ) {
Line 687  sub gradestatus { Line 677  sub gradestatus {
       $trystr = '\vskip 0 mm ';        $trystr = '\vskip 0 mm ';
   }    }
       } else {        } else {
          $trystr = "<td>".&mt('Tries')." $tries/$maxtries</td>";    $trystr = "<td>".&mt('Tries')." $tries";
     if($ENV{'request.state'} ne 'construct') { $trystr.="/$maxtries"; }
     $trystr.="</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 ) { 
       if ($target ne 'tex') {        if ($target ne 'tex') {
         $button = '<br /><input type="submit" name="submit" value="'.&mt('Submit Answer').'" />';          $button = '<input type="submit" name="submit" value="'.&mt('Submit Answer').'" />';
       }        }
     }      }
     if ($Apache::lonhomework::history{"resource.$id.afterduedate"}) {      if ($Apache::lonhomework::history{"resource.$id.afterduedate"}) {
Line 712  sub gradestatus { Line 704  sub gradestatus {
     if ($target eq 'tex') {      if ($target eq 'tex') {
       return $button.' \vskip 0 mm '.$output.' ';        return $button.' \vskip 0 mm '.$output.' ';
     } else {      } else {
       return $button.'<table><tr>'.$output.'</tr></table>';        return '<table><tr><td>'.$button.'</td>'.$output.'</tr></table>';
     }      }
   }    }
 }  }
Removed from v.1.124.2.1  
changed lines
  Added in v.1.127

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