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

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

version 1.127, 2004/01/28 21:42:51 version 1.131, 2004/02/24 22:34:51
Line 498  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::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 565  sub setgradedata { Line 566  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
     } elsif ( $previously_used eq 'PREVIOUSLY_LAST') {   # unneeded data and update the previously_used attribute
       #delete all data as they student didn't do anything, but save   if ( $previously_used eq 'PREVIOUSLY_USED') {
       #the list of collaborators.      if (lc($Apache::lonhomework::problemstatus) ne 'no') {
       &removealldata($id);   delete($Apache::lonhomework::results{"resource.$id.tries"});
       #and since they didn't do anything we were never here   $Apache::lonhomework::results{"resource.$id.previous"} = '1';
       return '';      }
     } else {   } elsif ( $previously_used eq 'PREVIOUSLY_LAST') {
       $Apache::lonhomework::results{"resource.$id.previous"} = '0';      #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/ ) {
Line 653  sub gradestatus { Line 661  sub gradestatus {
       ($showbutton,$bgcolor,$message,$previousmsg) =        ($showbutton,$bgcolor,$message,$previousmsg) =
  &decideoutput($award,$solved,$previous,$target);   &decideoutput($award,$solved,$previous,$target);
       if ($target eq 'tex') {        if ($target eq 'tex') {
  $message=' '.$message.' ';   $message='\vskip 2 mm '.$message.' ';
       } else {        } else {
  $message="<td bgcolor=\"$bgcolor\">$message</td>";   $message="<td bgcolor=\"$bgcolor\">$message</td>";
  if ($previousmsg) {   if ($previousmsg) {
Line 669  sub gradestatus { Line 677  sub gradestatus {
     if ( $tries eq '' ) { $tries = '0'; }      if ( $tries eq '' ) { $tries = '0'; }
     if ( $maxtries eq '' ) { $maxtries = '2'; }       if ( $maxtries eq '' ) { $maxtries = '2'; } 
     if ( $maxtries eq 'con_lost' ) { $maxtries = '0'; }       if ( $maxtries eq 'con_lost' ) { $maxtries = '0'; } 
       my $tries_text=&mt('Tries');
       if ( $Apache::lonhomework::type eq 'survey') { $tries_text=&mt('Submissions'); }
     if ( $showbutton ) {      if ( $showbutton ) {
       if ($target eq 'tex') {        if ($target eq 'tex') {
   if ($ENV{'request.state'} ne "construct" && $Apache::lonhomework::type ne 'exam') {    if ($ENV{'request.state'} ne "construct" && $Apache::lonhomework::type ne 'exam') {
       $trystr = ' {\vskip 1 mm \small \textit{'.&mt('Tries').'} '.$tries.'/'.$maxtries.'} \vskip 2 mm ';        $trystr = ' {\vskip 1 mm \small \textit{'.$tries_text.'} '.$tries.'/'.$maxtries.'} \vskip 2 mm ';
   } else {    } else {
       $trystr = '\vskip 0 mm ';        $trystr = '\vskip 0 mm ';
   }    }
       } else {        } else {
   $trystr = "<td>".&mt('Tries')." $tries";    $trystr = "<td>".$tries_text." $tries";
   if($ENV{'request.state'} ne 'construct') { $trystr.="/$maxtries"; }    if($ENV{'request.state'} ne 'construct') {
         $trystr.="/$maxtries";
     } else {
         if (defined($Apache::inputtags::params{'maxtries'})) {
     $trystr.="/".$Apache::inputtags::params{'maxtries'};
         }
     }
   $trystr.="</td>";    $trystr.="</td>";
       }        }
     }      }
Removed from v.1.127  
changed lines
  Added in v.1.131

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