Diff for /loncom/homework/structuretags.pm between versions 1.292 and 1.293

version 1.292, 2005/06/03 18:17:57 version 1.293, 2005/06/04 02:56:44
Line 373  sub store_aggregates { Line 373  sub store_aggregates {
         if ($Apache::lonhomework::results{'resource.'.$part.'.tries'} == 1) {          if ($Apache::lonhomework::results{'resource.'.$part.'.tries'} == 1) {
             $aggregate{$symb."\0".$part."\0users"} = 1;              $aggregate{$symb."\0".$part."\0users"} = 1;
         } else {          } else {
             my $last_reset = &get_last_reset($symb,$cdomain,$cname,$part);               my (undef,$last_reset) = &Apache::grades::get_last_resets($symb,$env{'request.course.id'},[$part]); 
             if ($last_reset) {              if ($last_reset) {
                 if (&get_num_tries($last_reset,$part) == 0) {                  if (&Apache::grades::get_num_tries(\%Apache::lonhomework::history,$last_reset,$part) == 0) {
                     $aggregate{$symb."\0".$part."\0users"} = 1;                      $aggregate{$symb."\0".$part."\0users"} = 1;
                 }                  }
             }              }
Line 388  sub store_aggregates { Line 388  sub store_aggregates {
     }      }
 }  }
   
 # ----------- Timestamp of last reset of aggregates  
 sub get_last_reset {  
     my ($symb,$cdomain,$cname,$part) =@_;  
     my $last_reset = '';  
     my %resethash = &Apache::lonnet::restore($symb,'nohist_resourcetracker',$cdomain,$cname);  
     if ($resethash{'version'}) {  
         for (my $version=$resethash{'version'};$version>=1;$version--) {  
             if (exists($resethash{$version.':'.$part."\0".'prev_attempts'})) {  
                 $last_reset = $resethash{$version.':timestamp'};  
                 last;  
             }  
         }  
     }  
     return $last_reset;  
 }  
   
 # ----------- Provides number of tries since last reset of aggregates  
 sub get_num_tries {  
     my ($last_reset,$part) = @_;  
     my $timestamp = '';  
     my $num_tries = 0;  
     if ($Apache::lonhomework::history{'version'}) {  
         for (my $version=$Apache::lonhomework::history{'version'};$version>=1;$version--) {  
             if (exists($Apache::lonhomework::history{$version.':resource.'.$part.'.solved'})) {  
                 $timestamp = $Apache::lonhomework::history{$version.':timestamp'};  
                 if ($timestamp > $last_reset) {  
                     $num_tries ++;  
                 } else {  
                     last;  
                 }  
             }  
         }  
     }  
     return $num_tries;  
 }  
   
   
 sub checkout_msg {  sub checkout_msg {
     my %lt=&Apache::lonlocal::texthash(       my %lt=&Apache::lonlocal::texthash( 
  'resource'=>'The resource needs to be checked out',   'resource'=>'The resource needs to be checked out',

Removed from v.1.292  
changed lines
  Added in v.1.293


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