--- loncom/homework/structuretags.pm 2005/06/03 18:17:57 1.292 +++ loncom/homework/structuretags.pm 2005/11/01 21:52:47 1.307 @@ -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.307 2005/11/01 21:52:47 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -74,8 +74,7 @@ sub body_tag_start { 'onunload="'.&Apache::lonmenu::unloadevents().'" '; if ($env{'browser.imagesuppress'} eq 'on') { $background=''; } if ($background) { - $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]= - $background; + &Apache::lonxml::extlink($background); $body_tag_start.='background="'.$background.'" '; } else { if (($bgcolor) && ($env{'browser.blackwhite'} ne 'on')) { @@ -88,11 +87,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,14 +117,16 @@ 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); my $bgcolor=&Apache::lonxml::get_param('bgcolor',$parstack, $safeeval); - $body_tag_start=&body_tag_start($background,$bgcolor); + $body_tag_start=&body_tag_start($target,$background,$bgcolor); if ( ($target eq 'web' || $target eq 'webgrade') && $env{'request.state'} ne 'construct') { my ($symb,undef,undef,undef,$publicuser)= @@ -192,7 +192,7 @@ sub setup_rndseed { delete($env{'form.newrandomization'}); } if (defined($rndseed) && $rndseed ne int($rndseed)) { - $rndseed=join(',',&Math::Random::random_seed_from_phrase($rndseed)); + $rndseed=join(':',&Apache::lonnet::digest($rndseed)); } if ($Apache::lonhomework::history{'resource.CODE'}) { $rndseed=&Apache::lonnet::rndseed(); @@ -373,9 +373,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 +388,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', @@ -472,6 +435,11 @@ sub init_problem_globals { @Apache::inputtags::partlist=(); $Apache::lonhomework::problemstatus=''; $Apache::lonhomework::ignore_response_errors=1; + } elsif ($type eq 'Task') { + $Apache::inputtags::part='0'; + @Apache::inputtags::partlist=('0'); + $Apache::lonhomework::problemstatus=''; + $Apache::lonhomework::ignore_response_errors=1; } @Apache::inputtags::responselist = (); @Apache::inputtags::importlist = (); @@ -559,6 +527,7 @@ sub start_problem { &Apache::lonxml::debug("Using default type, problem, :$uri:"); } } + $Apache::lonhomework::default_type = $Apache::lonhomework::type; #added vars to the scripting enviroment my $expression='$external::part=\''.$Apache::inputtags::part.'\';'; @@ -601,11 +570,12 @@ sub start_problem { value="'.$env{'form.username'}.'" />'; if ($env{'user.adv'}) { $form_tag_start.= - ' '.&mt(' Show All Foils'); + $form_tag_start.= ' />'.&mt(' Show All Foils'). + ''; } $form_tag_start.='