--- loncom/homework/structuretags.pm 2003/02/07 21:50:12 1.145 +++ loncom/homework/structuretags.pm 2003/02/27 20:01:05 1.151 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: structuretags.pm,v 1.145 2003/02/07 21:50:12 albertel Exp $ +# $Id: structuretags.pm,v 1.151 2003/02/27 20:01:05 sakharuk Exp $ # # Copyright Michigan State University Board of Trustees # @@ -35,6 +35,7 @@ package Apache::structuretags; use strict; use Apache::lonnet; use Apache::File(); +use Apache::lonmenu; BEGIN { &Apache::lonxml::register('Apache::structuretags',('block','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext')); @@ -43,7 +44,7 @@ BEGIN { sub start_web { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - my $bodytext=&Apache::lonxml::get_all_text("/web",$$parser[$#$parser]); + my $bodytext=&Apache::lonxml::get_all_text("/web",$parser); if ($target eq 'web') { return $bodytext; } @@ -56,7 +57,7 @@ sub end_web { sub start_tex { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - my $bodytext=&Apache::lonxml::get_all_text("/tex",$$parser[$#$parser]); + my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser); if ($target eq 'tex') { return $bodytext.' '; } @@ -81,12 +82,12 @@ sub page_start { if (!defined($found{'html'})) { $result=&Apache::londefdef::start_html($target,$token,$tagstack,$parstack, $parser,$safeeval); - $head_tag_start=''.&Apache::lonxml::registerurl(undef,$target); + $head_tag_start=''.&Apache::lonmenu::registerurl(undef,$target); } my $body_tag_start; if (!defined($found{'body'})) { - $body_tag_start=''; } 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 { @@ -359,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; @@ -375,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.'} \\\\\\\\'; @@ -386,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 \\\\\\\\'; } @@ -526,7 +539,7 @@ sub start_block { $result='1'; } if ( ! $result ) { - my $skip=&Apache::lonxml::get_all_text("/block",$$parser[-1]); + my $skip=&Apache::lonxml::get_all_text("/block",$parser); &Apache::lonxml::debug("skipping ahead :$skip: $$parser[-1]"); } $result=''; @@ -589,7 +602,7 @@ sub start_randomlist { my $result; if ($target eq 'answer' || $target eq 'grade' || $target eq 'web' || $target eq 'tex' || $target eq 'analyze') { - my $body= &Apache::lonxml::get_all_text("/randomlist",$$parser[$#$parser]); + my $body= &Apache::lonxml::get_all_text("/randomlist",$parser); my $b_parser= HTML::TokeParser->new(\$body); my $b_tok; my @randomlist; @@ -665,28 +678,35 @@ sub start_part { $Apache::inputtags::part=$id; @Apache::inputtags::responselist = (); @Apache::inputtags::previous=(); + my $hidden=&Apache::loncommon::check_if_partid_hidden($Apache::inputtags::part); + if ($target eq 'meta') { return &Apache::response::mandatory_part_meta; - } elsif ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') { - my ($status,$accessmsg) = &Apache::lonhomework::check_access($id); - push (@Apache::inputtags::status,$status); - my $expression='$external::datestatus="'.$status.'";'; - $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.$id.solved"}.'";'; - &Apache::run::run($expression,$safeeval); - if ( $status eq 'CLOSED' ) { - my $bodytext=&Apache::lonxml::get_all_text("/part",$$parser[$#$parser]); - if ( $target eq "web" ) { - $result="
Part is not open to be viewed. It $accessmsg
"; - } elsif ( $target eq 'tex' ) { - $result="\\end{minipage}\\vskip 0 mm Part is not open to be viewed. It $accessmsg \\\\\\begin{minipage}{\\textwidth}"; - } - } else { - if ($target eq 'tex') { - if ($$tagstack[-2] ne 'problem') { - $result.='\noindent \end{minipage}\vskip 0 mm \noindent \begin{minipage}{\textwidth}\noindent'; - } + } elsif ($target eq 'web' || $target eq 'grade' || + $target eq 'answer' || $target eq 'tex') { + if ($hidden) { + my $bodytext=&Apache::lonxml::get_all_text("/part",$parser); + } else { + my ($status,$accessmsg) = &Apache::lonhomework::check_access($id); + push (@Apache::inputtags::status,$status); + my $expression='$external::datestatus="'.$status.'";'; + $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.$id.solved"}.'";'; + &Apache::run::run($expression,$safeeval); + if ( $status eq 'CLOSED' ) { + my $bodytext=&Apache::lonxml::get_all_text("/part",$parser); + if ( $target eq "web" ) { + $result="
Part is not open to be viewed. It $accessmsg
"; + } elsif ( $target eq 'tex' ) { + $result="\\end{minipage}\\vskip 0 mm Part is not open to be viewed. It $accessmsg \\\\\\begin{minipage}{\\textwidth}"; + } + } else { + if ($target eq 'tex') { + $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}}';} + } + } } - } } elsif ($target eq 'edit') { $result.=&Apache::edit::tag_start($target,$token); $result.=&Apache::edit::text_arg('Part ID:','id',$token). @@ -708,12 +728,13 @@ sub end_part { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; &Apache::lonxml::debug("in end_part $target "); my $status=$Apache::inputtags::status['-1']; + my $hidden=&Apache::loncommon::check_if_partid_hidden($Apache::inputtags::part); my $result=''; if ( $target eq 'meta' ) { $result=''; - } elsif ( $target eq 'grade' && $status eq 'CAN_ANSWER') { + } elsif ( $target eq 'grade' && $status eq 'CAN_ANSWER' && !$hidden) { $result=&Apache::inputtags::grade; - } elsif ($target eq 'web' || $target eq 'tex' ) { + } elsif (($target eq 'web' || $target eq 'tex') && !$hidden ) { my $gradestatus=&Apache::inputtags::gradestatus($Apache::inputtags::part, $target); if ($Apache::lonhomework::type eq 'exam') {$gradestatus='';} @@ -729,7 +750,7 @@ sub start_preduedate { if ($Apache::inputtags::status['-1'] ne 'CAN_ANSWER' && $Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER' && $Apache::inputtags::status['-1'] ne 'SHOW_ANSWER') { - &Apache::lonxml::get_all_text("/preduedate",$$parser[$#$parser]); + &Apache::lonxml::get_all_text("/preduedate",$parser); } } return ''; @@ -743,7 +764,7 @@ sub start_postanswerdate { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; if ($target eq 'web' || $target eq 'grade' || $target eq 'tex') { if ($Apache::inputtags::status['-1'] ne 'SHOW_ANSWER') { - &Apache::lonxml::get_all_text("/postanswerdate",$$parser[$#$parser]); + &Apache::lonxml::get_all_text("/postanswerdate",$parser); } } elsif ($target eq 'tex') { return '\vskip 0 mm \noindent'; @@ -762,7 +783,7 @@ sub start_notsolved { &Apache::lonxml::debug("not solved has :$gradestatus:"); if ($gradestatus =~ /^correct/) { &Apache::lonxml::debug("skipping"); - &Apache::lonxml::get_all_text("/notsolved",$$parser[$#$parser]); + &Apache::lonxml::get_all_text("/notsolved",$parser); } } return ''; @@ -777,7 +798,7 @@ sub start_solved { if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') { my $gradestatus=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"}; if ($gradestatus !~ /^correct/) { - &Apache::lonxml::get_all_text("/solved",$$parser[$#$parser]); + &Apache::lonxml::get_all_text("/solved",$parser); } } return ''; @@ -799,18 +820,25 @@ sub end_startouttext { my $text=''; if ($target eq 'edit') { - $text=&Apache::lonxml::get_all_text("endouttext",$$parser[-1]); + $text=&Apache::lonxml::get_all_text("endouttext",$parser); $result.=&Apache::edit::start_table($token)."Text Block Delete:". &Apache::edit::deletelist($target,$token) ." ". &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['-1']); + $text=&Apache::lonxml::get_all_text("endouttext",$parser); $result=''.&Apache::edit::modifiedfield(); } if ($target eq 'tex') { @@ -835,7 +863,7 @@ sub end_endouttext { } sub delete_startouttext { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; -# my $text=&Apache::lonxml::get_all_text("endouttext",$$parser['-1']); +# my $text=&Apache::lonxml::get_all_text("endouttext",$parser); my $text=$$parser['-1']->get_text("/endouttext"); my $ntoken=$$parser['-1']->get_token(); &Apache::lonxml::debug("Deleting :$text: and :$ntoken->[0]:$ntoken->[1]:$ntoken->[2]: for startouttext");