--- loncom/homework/structuretags.pm 2005/06/03 18:17:57 1.292 +++ loncom/homework/structuretags.pm 2005/09/23 20:39:35 1.303 @@ -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.303 2005/09/23 20:39:35 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,14 +118,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)= @@ -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', @@ -559,6 +523,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 +566,12 @@ sub start_problem { value="'.$env{'form.username'}.'" />'; if ($env{'user.adv'}) { $form_tag_start.= - ' '; } $form_tag_start.='
'; } @@ -679,6 +645,10 @@ sub start_problem { } my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries"); if (defined($maxtries) && $maxtries < 0) { $allow_print_points=0; } + if (lc($env{'course.'.$env{'request.course.id'}. + '.disableexampointprint'}) eq 'yes') { + $allow_print_points=0; + } my $duedate = &Apache::lonnet::EXT("resource.$id.duedate"); $duedate = POSIX::strftime("%c",localtime($duedate)); my $temp_file; @@ -788,7 +758,8 @@ sub end_problem { } if ($target eq 'answer' && ($env{'request.state'} eq 'construct') && $env{'form.answer_output_mode'} ne 'tex') { - $result.=''; # normally we get it from xmlend, but in CSTR + $result.=&Apache::lonxml::xmlend().''; + # normally we get it from above, but in CSTR # we always show answer mode too. } } elsif ($target eq 'meta') { @@ -1107,17 +1078,19 @@ sub start_randomlist { # print "END-TAG $b_tok->[1]
"; # } } - my @idx_arr = (0 .. $#randomlist); - &Apache::structuretags::shuffle(\@idx_arr); - my $bodytext = ''; - my $show=$#randomlist; - my $showarg=&Apache::lonxml::get_param('show',$parstack,$safeeval); - $showarg--; - if ( ($showarg >= 0) && ($showarg < $show) ) { $show = $showarg; } - for(0 .. $show) { - $bodytext .= "$randomlist[ $idx_arr[$_] ]"; + if (@randomlist) { + my @idx_arr = (0 .. $#randomlist); + &Apache::structuretags::shuffle(\@idx_arr); + my $bodytext = ''; + my $show=$#randomlist; + my $showarg=&Apache::lonxml::get_param('show',$parstack,$safeeval); + $showarg--; + if ( ($showarg >= 0) && ($showarg < $show) ) { $show = $showarg; } + for(0 .. $show) { + $bodytext .= "$randomlist[ $idx_arr[$_] ]"; + } + &Apache::lonxml::newparser($parser,\$bodytext); } - &Apache::lonxml::newparser($parser,\$bodytext); } elsif ($target eq 'edit' ) { $result .=&Apache::edit::tag_start($target,$token); $result .=&Apache::edit::text_arg('Maximum Tags to Show:','show', @@ -1134,7 +1107,7 @@ sub start_randomlist { sub shuffle { my $a=shift; my $i; - if (defined(@$a)) { + if (ref($a) eq 'ARRAY' && @$a) { &Apache::response::pushrandomnumber(); for($i=@$a;--$i;) { my $j=int(&Math::Random::random_uniform() * ($i+1)); @@ -1170,7 +1143,7 @@ sub start_part { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result=''; my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval); - if ($id eq '') { $id = $Apache::lonxml::curdepth; } + if ($id =~ /^\s*$/) { $id = $Apache::lonxml::curdepth; } $Apache::inputtags::part=$id; push(@Apache::inputtags::partlist,$id); @Apache::inputtags::response=(); @@ -1240,6 +1213,10 @@ sub start_part { if (defined($maxtries) && $maxtries < 0) { $allow_print_points=0; } + if (lc($env{'course.'.$env{'request.course.id'}. + '.disableexampointprint'}) eq 'yes') { + $allow_print_points=0; + } if (($Apache::lonhomework::type eq 'exam') && ($allow_print_points)) { $result .= '\fbox{\textit{'.$weight.' pt}}';} } elsif ($target eq 'web') { $result.=''; @@ -1297,6 +1274,7 @@ sub end_part { } pop @Apache::inputtags::status; $Apache::inputtags::part=''; + $Apache::lonhomework::type = $Apache::lonhomework::default_type; return $result; } @@ -1304,7 +1282,8 @@ sub start_preduedate { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') { &Apache::lonxml::debug("State in preduedate is ". $Apache::inputtags::status['-1']); - 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::lonxml::debug("Wha? ". ($Apache::inputtags::status['-1'] ne 'SHOW_ANSWER')); &Apache::lonxml::get_all_text("/preduedate",$parser); @@ -1320,7 +1299,8 @@ sub end_preduedate { sub start_postanswerdate { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; if ($target eq 'web' || $target eq 'grade') { - if ($Apache::inputtags::status['-1'] ne 'SHOW_ANSWER') { + if ($Apache::lonhomework::scantronmode || + $Apache::inputtags::status['-1'] ne 'SHOW_ANSWER') { &Apache::lonxml::get_all_text("/postanswerdate",$parser); } } elsif ($target eq 'tex') {