--- loncom/homework/structuretags.pm 2005/06/03 18:17:57 1.292
+++ loncom/homework/structuretags.pm 2005/07/10 22:56:26 1.298
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: structuretags.pm,v 1.292 2005/06/03 18:17:57 raeburn Exp $
+# $Id: structuretags.pm,v 1.298 2005/07/10 22:56:26 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -88,11 +88,10 @@ sub body_tag_start {
$body_tag_start.=' style="font-size: x-large;" ';
}
$body_tag_start.='>'.&Apache::lonmenu::menubuttons(undef,$target,1);
+
+ &Apache::lontexconvert::jsMath_reset();
if ($env{'environment.texengine'} eq 'jsMath') {
- $body_tag_start.=''."\n".
- ''."\n";
+ $body_tag_start.=&Apache::lontexconvert::jsMath_header();
}
return $body_tag_start;
}
@@ -119,8 +118,10 @@ sub page_start {
my $body_tag_start;
if (!defined($found{'body'}) && $env{'request.state'} eq 'construct'
&& $env{'environment.remote'} eq 'off') {
- $body_tag_start=&Apache::loncommon::bodytag();
- $body_tag_start.=&Apache::lonxml::message_location();
+ if ($target eq 'web' || $target eq 'edit') {
+ $body_tag_start=&Apache::loncommon::bodytag();
+ $body_tag_start.=&Apache::lonxml::message_location();
+ }
} elsif (!defined($found{'body'})) {
my $background=&Apache::lonxml::get_param('background',$parstack,
$safeeval);
@@ -373,9 +374,9 @@ sub store_aggregates {
if ($Apache::lonhomework::results{'resource.'.$part.'.tries'} == 1) {
$aggregate{$symb."\0".$part."\0users"} = 1;
} 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 (&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;
}
}
@@ -388,43 +389,6 @@ 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 {
my %lt=&Apache::lonlocal::texthash(
'resource'=>'The resource needs to be checked out',
@@ -547,6 +511,7 @@ sub start_problem {
defined($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:");
}
if ($Apache::lonhomework::type eq '' ) {
@@ -788,7 +753,8 @@ sub end_problem {
}
if ($target eq 'answer' && ($env{'request.state'} eq 'construct')
&& $env{'form.answer_output_mode'} ne 'tex') {
- $result.='