version 1.284, 2005/04/07 06:56:22
|
version 1.305, 2005/10/17 16:06:32
|
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 383 sub init_problem_globals {
|
Line 436 sub init_problem_globals {
|
@Apache::inputtags::partlist=(); |
@Apache::inputtags::partlist=(); |
$Apache::lonhomework::problemstatus=''; |
$Apache::lonhomework::problemstatus=''; |
$Apache::lonhomework::ignore_response_errors=1; |
$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::responselist = (); |
@Apache::inputtags::importlist = (); |
@Apache::inputtags::importlist = (); |
Line 470 sub start_problem {
|
Line 528 sub start_problem {
|
&Apache::lonxml::debug("Using default type, problem, :$uri:"); |
&Apache::lonxml::debug("Using default type, problem, :$uri:"); |
} |
} |
} |
} |
|
$Apache::lonhomework::default_type = $Apache::lonhomework::type; |
|
|
#added vars to the scripting enviroment |
#added vars to the scripting enviroment |
my $expression='$external::part=\''.$Apache::inputtags::part.'\';'; |
my $expression='$external::part=\''.$Apache::inputtags::part.'\';'; |
Line 512 sub start_problem {
|
Line 571 sub start_problem {
|
value="'.$env{'form.username'}.'" />'; |
value="'.$env{'form.username'}.'" />'; |
if ($env{'user.adv'}) { |
if ($env{'user.adv'}) { |
$form_tag_start.= |
$form_tag_start.= |
' <input type="checkbox" name="showallfoils" '; |
' <label><input type="checkbox" name="showallfoils" '; |
if (defined($env{'form.showallfoils'})) { |
if (defined($env{'form.showallfoils'})) { |
$form_tag_start.='checked="on"'; |
$form_tag_start.='checked="on"'; |
} |
} |
$form_tag_start.= ' />'.&mt(' Show All Foils'); |
$form_tag_start.= ' />'.&mt(' Show All Foils'). |
|
'</label>'; |
} |
} |
$form_tag_start.='<hr />'; |
$form_tag_start.='<hr />'; |
} |
} |
Line 590 sub start_problem {
|
Line 650 sub start_problem {
|
} |
} |
my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries"); |
my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries"); |
if (defined($maxtries) && $maxtries < 0) { $allow_print_points=0; } |
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"); |
my $duedate = &Apache::lonnet::EXT("resource.$id.duedate"); |
$duedate = POSIX::strftime("%c",localtime($duedate)); |
$duedate = POSIX::strftime("%c",localtime($duedate)); |
my $temp_file; |
my $temp_file; |
Line 603 sub start_problem {
|
Line 667 sub start_problem {
|
my $due_file_content = $due_file_content[$#due_file_content]; |
my $due_file_content = $due_file_content[$#due_file_content]; |
chomp $due_file_content; |
chomp $due_file_content; |
my $name_of_resourse= &Apache::lonxml::latex_special_symbols(&get_resource_name($parstack,$safeeval),'header'); |
my $name_of_resourse= &Apache::lonxml::latex_special_symbols(&get_resource_name($parstack,$safeeval),'header'); |
|
my $begin_doc='\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$env{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND} \noindent '; |
|
my $toc_line='\vskip 1 mm\noindent '.$startminipage. |
|
'\addcontentsline{toc}{subsection}{'.$name_of_resourse.'}'; |
if ($due_file_content ne $duedate) { |
if ($due_file_content ne $duedate) { |
$temp_file = Apache::File->new('>'.$filename); |
$temp_file = Apache::File->new('>'.$filename); |
print $temp_file "$duedate\n"; |
print $temp_file "$duedate\n"; |
if (not $env{'request.symb'} =~ m/\.page_/) { |
if (not $env{'request.symb'} =~ m/\.page_/) { |
if(not $duedate=~m/1969/ and $Apache::lonhomework::type ne 'exam') { |
if(not $duedate=~m/1969/ and $Apache::lonhomework::type ne 'exam') { |
$result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$env{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND} \noindent\textit{Due date: '.$duedate.'} \vskip 1 mm\noindent '.$startminipage.'\addcontentsline{toc}{subsection}{'.$name_of_resourse.'}'; |
$result .= $begin_doc. |
|
'\textit{Due date: '.$duedate.'} '.$toc_line; |
} else { |
} else { |
$result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$env{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND} \noindent \vskip 1 mm \noindent'.$startminipage.'\addcontentsline{toc}{subsection}{'.$name_of_resourse.'}'; |
$result .= $begin_doc.$toc_line; |
if ($Apache::lonhomework::type eq 'exam' and $allow_print_points==1) { $result .= '\fbox{\textit{'.$weight.' pt}}';} |
if ($Apache::lonhomework::type eq 'exam' and $allow_print_points==1) { $result .= '\fbox{\textit{'.$weight.' pt}}';} |
} |
} |
} else { |
} else { |
Line 618 sub start_problem {
|
Line 686 sub start_problem {
|
} |
} |
} else { |
} else { |
if (not $env{'request.symb'} =~ m/\.page_/) { |
if (not $env{'request.symb'} =~ m/\.page_/) { |
$result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$env{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND} \noindent \vskip 1 mm\noindent'.$startminipage.'\addcontentsline{toc}{subsection}{'.$name_of_resourse.'}'; |
$result .= $begin_doc.$toc_line; |
if (($Apache::lonhomework::type eq 'exam') and ($allow_print_points==1)) { $result .= '\fbox{\textit{'.$weight.' pt}}';} |
if (($Apache::lonhomework::type eq 'exam') and ($allow_print_points==1)) { $result .= '\fbox{\textit{'.$weight.' pt}}';} |
} else { |
} else { |
$result .= '\vskip 1mm \\\\\\\\'; |
$result .= '\vskip 1mm \\\\\\\\'; |
Line 699 sub end_problem {
|
Line 767 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 994 sub start_randomlist {
|
Line 1063 sub start_randomlist {
|
if ($target eq 'answer' || $target eq 'grade' || $target eq 'web' || |
if ($target eq 'answer' || $target eq 'grade' || $target eq 'web' || |
$target eq 'tex' || $target eq 'analyze') { |
$target eq 'tex' || $target eq 'analyze') { |
my $body= &Apache::lonxml::get_all_text("/randomlist",$parser); |
my $body= &Apache::lonxml::get_all_text("/randomlist",$parser); |
my $b_parser= HTML::TokeParser->new(\$body); |
my $b_parser= HTML::LCParser->new(\$body); |
|
$b_parser->xml_mode(1); |
|
$b_parser->marked_sections(1); |
my $b_tok; |
my $b_tok; |
my @randomlist; |
my @randomlist; |
my $list_item; |
my $list_item; |
Line 1018 sub start_randomlist {
|
Line 1089 sub start_randomlist {
|
# print "<b>END-TAG $b_tok->[1]</b><br />"; |
# print "<b>END-TAG $b_tok->[1]</b><br />"; |
# } |
# } |
} |
} |
my @idx_arr = (0 .. $#randomlist); |
if (@randomlist) { |
&Apache::structuretags::shuffle(\@idx_arr); |
my @idx_arr = (0 .. $#randomlist); |
my $bodytext = ''; |
&Apache::structuretags::shuffle(\@idx_arr); |
my $show=$#randomlist; |
my $bodytext = ''; |
my $showarg=&Apache::lonxml::get_param('show',$parstack,$safeeval); |
my $show=$#randomlist; |
$showarg--; |
my $showarg=&Apache::lonxml::get_param('show',$parstack,$safeeval); |
if ( ($showarg >= 0) && ($showarg < $show) ) { $show = $showarg; } |
$showarg--; |
for(0 .. $show) { |
if ( ($showarg >= 0) && ($showarg < $show) ) { $show = $showarg; } |
$bodytext .= "$randomlist[ $idx_arr[$_] ]"; |
for(0 .. $show) { |
|
$bodytext .= "$randomlist[ $idx_arr[$_] ]"; |
|
} |
|
&Apache::lonxml::newparser($parser,\$bodytext); |
} |
} |
&Apache::lonxml::newparser($parser,\$bodytext); |
|
} elsif ($target eq 'edit' ) { |
} elsif ($target eq 'edit' ) { |
$result .=&Apache::edit::tag_start($target,$token); |
$result .=&Apache::edit::tag_start($target,$token); |
$result .=&Apache::edit::text_arg('Maximum Tags to Show:','show', |
$result .=&Apache::edit::text_arg('Maximum Tags to Show:','show', |
Line 1045 sub start_randomlist {
|
Line 1118 sub start_randomlist {
|
sub shuffle { |
sub shuffle { |
my $a=shift; |
my $a=shift; |
my $i; |
my $i; |
if (defined(@$a)) { |
if (ref($a) eq 'ARRAY' && @$a) { |
&Apache::response::pushrandomnumber(); |
&Apache::response::pushrandomnumber(); |
for($i=@$a;--$i;) { |
for($i=@$a;--$i;) { |
my $j=int(&Math::Random::random_uniform() * ($i+1)); |
my $j=int(&Math::Random::random_uniform() * ($i+1)); |
Line 1081 sub start_part {
|
Line 1154 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 1151 sub start_part {
|
Line 1224 sub start_part {
|
if (defined($maxtries) && $maxtries < 0) { |
if (defined($maxtries) && $maxtries < 0) { |
$allow_print_points=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}}';} |
if (($Apache::lonhomework::type eq 'exam') && ($allow_print_points)) { $result .= '\fbox{\textit{'.$weight.' pt}}';} |
} elsif ($target eq 'web') { |
} elsif ($target eq 'web') { |
$result.='<a name="'.&Apache::lonnet::escape($Apache::inputtags::part).'" />'; |
$result.='<a name="'.&Apache::lonnet::escape($Apache::inputtags::part).'" />'; |
Line 1208 sub end_part {
|
Line 1285 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; |
} |
} |
|
|
Line 1215 sub start_preduedate {
|
Line 1293 sub start_preduedate {
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') { |
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') { |
&Apache::lonxml::debug("State in preduedate is ". $Apache::inputtags::status['-1']); |
&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::inputtags::status['-1'] ne 'CANNOT_ANSWER') { |
&Apache::lonxml::debug("Wha? ". ($Apache::inputtags::status['-1'] ne 'SHOW_ANSWER')); |
&Apache::lonxml::debug("Wha? ". ($Apache::inputtags::status['-1'] ne 'SHOW_ANSWER')); |
&Apache::lonxml::get_all_text("/preduedate",$parser); |
&Apache::lonxml::get_all_text("/preduedate",$parser); |
Line 1231 sub end_preduedate {
|
Line 1310 sub end_preduedate {
|
sub start_postanswerdate { |
sub start_postanswerdate { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
if ($target eq 'web' || $target eq 'grade') { |
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); |
&Apache::lonxml::get_all_text("/postanswerdate",$parser); |
} |
} |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |