--- loncom/homework/structuretags.pm 2003/03/14 23:27:19 1.144.2.1 +++ loncom/homework/structuretags.pm 2003/02/25 21:49:45 1.149 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: structuretags.pm,v 1.144.2.1 2003/03/14 23:27:19 albertel Exp $ +# $Id: structuretags.pm,v 1.149 2003/02/25 21:49:45 albertel 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='new(\$body); my $b_tok; my @randomlist; @@ -662,29 +666,35 @@ sub start_part { $Apache::inputtags::part=$id; @Apache::inputtags::responselist = (); @Apache::inputtags::previous=(); - @Apache::inputtags::previous_version=(); + 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') { + if ($$tagstack[-2] ne 'problem') { + $result.='\noindent \end{minipage}\vskip 0 mm \noindent \begin{minipage}{\textwidth}\noindent'; + } + } + } } - } } elsif ($target eq 'edit') { $result.=&Apache::edit::tag_start($target,$token); $result.=&Apache::edit::text_arg('Part ID:','id',$token). @@ -706,12 +716,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='';} @@ -727,7 +738,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 ''; @@ -741,7 +752,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'; @@ -760,7 +771,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 ''; @@ -775,7 +786,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 ''; @@ -797,7 +808,7 @@ 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) @@ -808,7 +819,7 @@ sub end_startouttext { &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') { @@ -833,7 +844,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");