version 1.284, 2005/04/07 06:56:22
|
version 1.299, 2005/09/01 18:21:47
|
Line 68 sub end_tex {
|
Line 68 sub end_tex {
|
return ''; |
return ''; |
} |
} |
|
|
|
sub body_tag_start { |
|
my ($target,$background,$bgcolor)=@_; |
|
my $body_tag_start='<body onload="'.&Apache::lonmenu::loadevents().'" '. |
|
'onunload="'.&Apache::lonmenu::unloadevents().'" '; |
|
if ($env{'browser.imagesuppress'} eq 'on') { $background=''; } |
|
if ($background) { |
|
$Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]= |
|
$background; |
|
$body_tag_start.='background="'.$background.'" '; |
|
} else { |
|
if (($bgcolor) && ($env{'browser.blackwhite'} ne 'on')) { |
|
$body_tag_start.='bgcolor="'.$bgcolor.'" '; |
|
} else { |
|
$body_tag_start.='bgcolor="#ffffff"'; |
|
} |
|
} |
|
if ($env{'browser.fontenhance'} eq 'on') { |
|
$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.=&Apache::lontexconvert::jsMath_header(); |
|
} |
|
return $body_tag_start; |
|
} |
|
|
sub page_start { |
sub page_start { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my %found; |
my %found; |
Line 90 sub page_start {
|
Line 118 sub page_start {
|
my $body_tag_start; |
my $body_tag_start; |
if (!defined($found{'body'}) && $env{'request.state'} eq 'construct' |
if (!defined($found{'body'}) && $env{'request.state'} eq 'construct' |
&& $env{'environment.remote'} eq 'off') { |
&& $env{'environment.remote'} eq 'off') { |
$body_tag_start=&Apache::loncommon::bodytag(); |
if ($target eq 'web' || $target eq 'edit') { |
$body_tag_start.=&Apache::lonxml::message_location(); |
$body_tag_start=&Apache::loncommon::bodytag(); |
|
$body_tag_start.=&Apache::lonxml::message_location(); |
|
} |
} elsif (!defined($found{'body'})) { |
} elsif (!defined($found{'body'})) { |
$body_tag_start='<body onload="'.&Apache::lonmenu::loadevents().'" '. |
|
'onunload="'.&Apache::lonmenu::unloadevents().'" '; |
|
my $background=&Apache::lonxml::get_param('background',$parstack, |
my $background=&Apache::lonxml::get_param('background',$parstack, |
$safeeval); |
$safeeval); |
if ($env{'browser.imagesuppress'} eq 'on') { $background=''; } |
my $bgcolor=&Apache::lonxml::get_param('bgcolor',$parstack, |
if ($background) { |
$safeeval); |
$Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]= |
$body_tag_start=&body_tag_start($target,$background,$bgcolor); |
$background; |
if ( ($target eq 'web' || $target eq 'webgrade') |
$body_tag_start.='background="'.$background.'" '; |
&& $env{'request.state'} ne 'construct') { |
} else { |
|
my $bgcolor=&Apache::lonxml::get_param('bgcolor',$parstack, |
|
$safeeval); |
|
if (($bgcolor) && ($env{'browser.blackwhite'} ne 'on')) { |
|
$body_tag_start.='bgcolor="'.$bgcolor.'" '; |
|
} else { |
|
$body_tag_start.='bgcolor="#ffffff"'; |
|
} |
|
} |
|
if ($env{'browser.fontenhance'} eq 'on') { |
|
$body_tag_start.=' style="font-size: x-large;" '; |
|
} |
|
$body_tag_start.='>'.&Apache::lonmenu::menubuttons(undef,$target,1); |
|
if ($env{'environment.texengine'} eq 'jsMath') { |
|
$body_tag_start.='<script type="text/javascript"> |
|
function NoFontMessage () {} |
|
</script>'."\n". |
|
'<script src="/adm/jsMath/jsMath.js"></script>'."\n"; |
|
} |
|
if ($target eq 'web' && $env{'request.state'} ne 'construct') { |
|
my ($symb,undef,undef,undef,$publicuser)= |
my ($symb,undef,undef,undef,$publicuser)= |
&Apache::lonxml::whichuser(); |
&Apache::lonxml::whichuser(); |
if ($symb eq '' && !$publicuser) { |
if ($symb eq '' && !$publicuser) { |
Line 317 sub initialize_storage {
|
Line 325 sub initialize_storage {
|
# Stores away the result has to a student's environment |
# Stores away the result has to a student's environment |
# checks form.grade_ for specific values, other wises stores |
# checks form.grade_ for specific values, other wises stores |
# to the running users environment |
# to the running users environment |
|
# Will increment totals for attempts, students, and corrects |
|
# if running user has student role. |
sub finalize_storage { |
sub finalize_storage { |
my $result; |
my $result; |
my ($temp) = keys %Apache::lonhomework::results; |
if (%Apache::lonhomework::results) { |
if ( $temp ne '' ) { |
|
my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser(); |
my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser(); |
if ($env{'request.state'} eq 'construct' || $symb eq '') { |
if ($env{'request.state'} eq 'construct' || $symb eq '') { |
$Apache::lonhomework::results{'rndseed'}=$env{'form.rndseed'}; |
$Apache::lonhomework::results{'rndseed'}=$env{'form.rndseed'}; |
Line 331 sub finalize_storage {
|
Line 340 sub finalize_storage {
|
$result=&Apache::lonnet::cstore(\%Apache::lonhomework::results, |
$result=&Apache::lonnet::cstore(\%Apache::lonhomework::results, |
$symb,$courseid,$domain,$name); |
$symb,$courseid,$domain,$name); |
&Apache::lonxml::debug('Store return message:'.$result); |
&Apache::lonxml::debug('Store return message:'.$result); |
|
if ($env{'request.role'} =~/^st/) { |
|
&store_aggregates($symb,$courseid); |
|
} |
} |
} |
} |
} |
return $result; |
return $result; |
} |
} |
|
use Data::Dumper; |
|
|
|
# -------------------------------------------------------------store_aggregates |
|
# Sends hash of values to be incremented in nohist_resourcetracker.db |
|
# for the course. Increments total number of attempts, unique students |
|
# and corrects for each part for an instance of a problem, as appropriate. |
|
sub store_aggregates { |
|
my ($symb,$courseid) = @_; |
|
my %aggregate; |
|
my @parts; |
|
my $cdomain = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
|
my $cname = $env{'course.'.$env{'request.course.id'}.'.num'}; |
|
foreach my $key (keys(%Apache::lonhomework::results)) { |
|
if ($key =~ /resource\.([^\.]+)\.tries/) { |
|
push(@parts, $1); |
|
} |
|
} |
|
foreach my $part (@parts) { |
|
if ($Apache::lonhomework::results{'resource.'.$part.'.award'} |
|
eq 'APPROX_ANS' || |
|
$Apache::lonhomework::results{'resource.'.$part.'.award'} |
|
eq 'EXACT_ANS') { |
|
$aggregate{$symb."\0".$part."\0correct"} = 1; |
|
} |
|
if ($Apache::lonhomework::results{'resource.'.$part.'.tries'} == 1) { |
|
$aggregate{$symb."\0".$part."\0users"} = 1; |
|
} else { |
|
my (undef,$last_reset) = &Apache::grades::get_last_resets($symb,$env{'request.course.id'},[$part]); |
|
if ($last_reset) { |
|
if (&Apache::grades::get_num_tries(\%Apache::lonhomework::history,$last_reset,$part) == 0) { |
|
$aggregate{$symb."\0".$part."\0users"} = 1; |
|
} |
|
} |
|
} |
|
$aggregate{$symb."\0".$part."\0attempts"} = 1; |
|
} |
|
if (keys (%aggregate) > 0) { |
|
&Apache::lonnet::cinc('nohist_resourcetracker',\%aggregate, |
|
$cdomain,$cname); |
|
} |
|
} |
|
|
sub checkout_msg { |
sub checkout_msg { |
my %lt=&Apache::lonlocal::texthash( |
my %lt=&Apache::lonlocal::texthash( |
Line 458 sub start_problem {
|
Line 511 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 699 sub end_problem {
|
Line 753 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 1081 sub start_part {
|
Line 1136 sub start_part {
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my $result=''; |
my $result=''; |
my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval); |
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; |
$Apache::inputtags::part=$id; |
push(@Apache::inputtags::partlist,$id); |
push(@Apache::inputtags::partlist,$id); |
@Apache::inputtags::response=(); |
@Apache::inputtags::response=(); |
Line 1208 sub end_part {
|
Line 1263 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; |
} |
} |
|
|