version 1.292, 2005/06/03 18:17:57
|
version 1.295, 2005/06/28 19:17:36
|
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', |
Line 547 sub start_problem {
|
Line 510 sub start_problem {
|
defined($env{'form.problemtype'})) { |
defined($env{'form.problemtype'})) { |
$Apache::lonhomework::type=$env{'form.problemtype'}; |
$Apache::lonhomework::type=$env{'form.problemtype'}; |
} |
} |
|
$Apache::lonhomework::default_type = $Apache::lonhomework::type; |
&Apache::lonxml::debug("Found this to be of type :$Apache::ltonhomework::type:"); |
&Apache::lonxml::debug("Found this to be of type :$Apache::ltonhomework::type:"); |
} |
} |
if ($Apache::lonhomework::type eq '' ) { |
if ($Apache::lonhomework::type eq '' ) { |
Line 788 sub end_problem {
|
Line 752 sub end_problem {
|
} |
} |
if ($target eq 'answer' && ($env{'request.state'} eq 'construct') |
if ($target eq 'answer' && ($env{'request.state'} eq 'construct') |
&& $env{'form.answer_output_mode'} ne 'tex') { |
&& $env{'form.answer_output_mode'} ne 'tex') { |
$result.='</html>'; # normally we get it from xmlend, but in CSTR |
$result.=&Apache::lonxml::xmlend().'</html>'; |
|
# normally we get it from above, but in CSTR |
# we always show answer mode too. |
# we always show answer mode too. |
} |
} |
} elsif ($target eq 'meta') { |
} elsif ($target eq 'meta') { |
Line 1297 sub end_part {
|
Line 1262 sub end_part {
|
} |
} |
pop @Apache::inputtags::status; |
pop @Apache::inputtags::status; |
$Apache::inputtags::part=''; |
$Apache::inputtags::part=''; |
|
$Apache::lonhomework::type = $Apache::lonhomework::default_type; |
return $result; |
return $result; |
} |
} |
|
|