--- loncom/homework/structuretags.pm 2003/02/25 21:49:45 1.149 +++ loncom/homework/structuretags.pm 2003/03/03 15:59:42 1.152 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: structuretags.pm,v 1.149 2003/02/25 21:49:45 albertel Exp $ +# $Id: structuretags.pm,v 1.152 2003/03/03 15:59:42 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -101,7 +101,7 @@ sub page_start { $body_tag_start.='bgcolor="#ffffff"'; } } - $body_tag_start.='>'.&Apache::lonmenu::menubuttons(undef,$target); + $body_tag_start.='>'.&Apache::lonmenu::menubuttons(undef,$target,1); if ($target eq 'web' && $ENV{'request.state'} ne 'construct') { my ($symb)=&Apache::lonxml::whichuser(); if ($symb eq '') { @@ -253,6 +253,7 @@ sub start_problem { $Apache::inputtags::part='0'; @Apache::inputtags::responselist = (); @Apache::inputtags::previous=(); + $Apache::structuretags::printanswer='No'; if ($target ne 'analyze') { &initialize_storage(); if ($target eq 'web') { @@ -323,7 +324,7 @@ sub start_problem { } $result.=$msg.'
'; } elsif ($target eq 'tex') { - $result.="\\begin{document}\\noindent \\vskip 1 mm \\begin{minipage}{\\textwidth}\\vskip 0 mm "; + $result.='\begin{document}\noindent \vskip 1 mm \begin{minipage}{\textwidth}\vskip 0 mm'; if ($status eq 'UNAVAILABLE') { $result.='Unable to determine if this resource is open due to network problems. Please try again later.\vskip 0 mm '; } else { @@ -360,6 +361,15 @@ sub start_problem { } $Apache::lonhomework::name=$name; my $id = $Apache::inputtags::part; + my $weight = &Apache::lonnet::EXT("resource.$id.weight"); + my $allkeys = &Apache::lonnet::metadata($ENV{'request.uri'},'keys'); + my @allkeys = split /,/,$allkeys; + my $allow_print_points = 0; + foreach my $partial_key (@allkeys) { + if ($partial_key=~m/weight/) { + $allow_print_points++; + } + } my $duedate = &Apache::lonnet::EXT("resource.$id.duedate"); $duedate = POSIX::strftime("%c",localtime($duedate)); my $temp_file; @@ -376,10 +386,11 @@ sub start_problem { $temp_file = Apache::File->new('>'.$filename); print $temp_file "$duedate\n"; if (not $ENV{'request.symb'} =~ m/\.page_/) { - if(not $duedate=~m/1969/) { + if(not $duedate=~m/1969/ and $Apache::lonhomework::type ne 'exam') { $result .= '\begin{document} \noindent\textit{Due date: '.$duedate.'} \vskip 1 mm\noindent \begin{minipage}{\textwidth}'; } else { $result .= '\begin{document} \noindent \vskip 1 mm \noindent\begin{minipage}{\textwidth}'; + if ($Apache::lonhomework::type eq 'exam' and $allow_print_points==1) { $result .= '\fbox{\textit{'.$weight.' pt}}';} } } else { $result .= '\vskip 1mm\textit{Due date: '.$duedate.'} \\\\\\\\'; @@ -387,6 +398,7 @@ sub start_problem { } else { if (not $ENV{'request.symb'} =~ m/\.page_/) { $result .= '\begin{document} \noindent \vskip 1 mm\noindent\begin{minipage}{\textwidth}'; + if (($Apache::lonhomework::type eq 'exam') and ($allow_print_points==1)) { $result .= '\fbox{\textit{'.$weight.' pt}}';} } else { $result .= '\vskip 1mm \\\\\\\\'; } @@ -689,9 +701,9 @@ sub start_part { } } else { if ($target eq 'tex') { - if ($$tagstack[-2] ne 'problem') { - $result.='\noindent \end{minipage}\vskip 0 mm \noindent \begin{minipage}{\textwidth}\noindent'; - } + $result.='\noindent \end{minipage}\vskip 0 mm \noindent \begin{minipage}{\textwidth}\noindent'; + my $weight = &Apache::lonnet::EXT("resource.$id.weight"); + if ($Apache::lonhomework::type eq 'exam') { $result .= '\fbox{\textit{'.$weight.' pt}}';} } } } @@ -815,8 +827,15 @@ sub end_startouttext { ." ". &Apache::edit::insertlist($target,$token). - &Apache::edit::end_row().&Apache::edit::start_spanning_row()."\n". - &Apache::edit::editfield($token->[1],$text,"",80,4); + &Apache::edit::end_row().&Apache::edit::start_spanning_row()."\n" + .'
'. + &Apache::loncommon::help_open_topic("Greek_Symbols",'Greek Symbols', + undef,undef,600) + .''. + &Apache::loncommon::help_open_topic("Other_Symbols",'Other Symbols', + undef,undef,600) + .'
'. + &Apache::edit::editfield($token->[1],$text,"",80,4); } if ($target eq 'modified') { $text=&Apache::lonxml::get_all_text("endouttext",$parser);