--- loncom/homework/structuretags.pm 2001/06/05 16:32:18 1.41 +++ loncom/homework/structuretags.pm 2001/08/18 16:38:00 1.59 @@ -1,13 +1,16 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # 2/19 Guy +# 6/26/2001 fixed extra web display at end of tags +# 8/17,8/18 Gerd Kortemeyer + package Apache::structuretags; use strict; use Apache::lonnet; sub BEGIN { - &Apache::lonxml::register('Apache::structuretags',('block','while','randomlist','problem','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext')); + &Apache::lonxml::register('Apache::structuretags',('block','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext')); # &Apache::lonxml::register_insert('problem','',('part','postanswerdate','preduedate')) } @@ -21,6 +24,7 @@ sub start_web { } sub end_web { + return ''; } sub start_tex { @@ -33,6 +37,30 @@ sub start_tex { } sub end_tex { + return ''; +} + +sub page_start { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my $result=&Apache::londefdef::start_html($target,$token,$tagstack,$parstack,$parser,$safeeval); + my $head_tag_start=''.&Apache::lonxml::registerurl(); + my $body_tag_start=' or the neccesary stuff to start XML/MathML - my $result=&Apache::londefdef::start_html($target,$token,$tagstack,$parstack,$parser,$safeeval); + my ($result,$head_tag_start,$body_tag_start)= + &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval); - my $head_tag_start=''.&Apache::lonxml::registerurl(); - my $body_tag_start=''; + if ($Apache::lonhomework::type eq 'exam') { + if ($target eq 'web') { + my $token=$Apache::lonhomework::history{"resource.0.outtoken"}; + if (($ENV{'form.doescheckout'}) && (!$token)) { + $token=&Apache::lonxml::maketoken(); + } + $body_tag_start.=&Apache::lonxml::printtokenheader($target,$token); + } + if ($target eq 'meta') { + + return (< + + + + + + +ENDSTORES + } + } if ($target eq 'web' || $target eq 'grade') { - ($status,$datemsg) = &Apache::lonhomework::check_date('0'); + ($status,$accessmsg) = &Apache::lonhomework::check_access('0'); push (@Apache::inputtags::status,$status); my $expression='$external::datestatus="'.$status.'";'; $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.0.solved"}.'";'; &Apache::run::run($expression,$safeeval); - if ( $status eq 'CLOSED' ) { + if (( $status eq 'CLOSED' ) || + ( $status eq 'UNCHECKEDOUT') || + ( $status eq 'BANNED')) { my $bodytext=&Apache::lonxml::get_all_text("/problem",$$parser[$#$parser]); if ( $target eq "web" ) { $result.= $head_tag_start.''; - return $result . $body_tag_start . - "
Problem is not open to be viewed. The problem $datemsg
"; + my $msg=$body_tag_start. + '

Not open to be viewed

'; + if ($status eq 'CLOSED') { + $msg.='The problem '.$accessmsg; + } elsif ($status eq 'UNCHECKEDOUT') { + $msg.=(<The resource needs to be checked out +As a resource gets checked out, a unique timestamped ID is given to it, and a +permanent record is left in the system.

+ +Checking out resources is subject to course policies, and may exclude future +credit even if done erroneously.

+ +

+ +
+ENDCHECKOUT + } + return $result.$msg.'
'; } } } @@ -99,6 +184,7 @@ sub start_problem {
+
'; my $temp=&Apache::edit::insertlist($target,$token); $result.=$temp; @@ -132,6 +218,7 @@ sub end_problem { } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') { $result.="\n"; } + $result.=&Apache::lonxml::xmlend(); } } if ($target eq 'meta') { @@ -146,6 +233,39 @@ sub end_problem { return $result; } +sub start_library { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my ($result,$head_tag_start,$body_tag_start)= + &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval); + if ($target eq 'edit') { + $result.=$head_tag_start."".$body_tag_start. + '
+ + + +
+ '; + my $temp=&Apache::edit::insertlist($target,$token); + $result.=$temp; + return $result; + } + if ($target eq 'modified') { + $result=$token->[4]; + $result.=&Apache::edit::handle_insert(); + return $result; + } + return ''; +} + +sub end_library { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my $result=''; + if ($target eq 'edit') { + $result='
'; + } + return $result; +} + sub start_block { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; @@ -242,6 +362,7 @@ sub start_randomlist { sub shuffle { my $a=shift; my $i; + &Apache::response::setrandomnumber(); for($i=@$a;--$i;) { my $j=int rand($i+1); next if $i == $j; @@ -250,17 +371,20 @@ sub shuffle { } sub end_randomlist { + return ''; } sub start_part { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval); + if ($id eq '') { $id = $Apache::lonxml::curdepth; } $Apache::inputtags::part=$id; @Apache::inputtags::responselist = (); + @Apache::inputtags::previous=(); if ($target eq 'meta') { return &Apache::response::mandatory_part_meta; } elsif ($target eq 'web' || $target eq 'grade') { - my ($status,$datemsg) = &Apache::lonhomework::check_date("OPEN_DATE",$id); + 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"}.'";'; @@ -268,7 +392,7 @@ sub start_part { if ( $status eq 'CLOSED' ) { my $bodytext=&Apache::lonxml::get_all_text("/part",$$parser[$#$parser]); if ( $target eq "web" ) { - return "
Part is not open to be viewed. It $datemsg
"; + return "
Part is not open to be viewed. It $accessmsg
"; } } } @@ -364,9 +488,15 @@ sub end_startouttext { if ($target eq 'edit') { $text=&Apache::lonxml::get_all_text("endouttext",$$parser[$#$parser]); - $result= - &Apache::edit::tag_start($target,$token). - &Apache::edit::editfield($token->[1],$text,"Text Block",50,5); + $result.=&Apache::edit::start_table($token)."Text Block +Delete:". + &Apache::edit::deletelist($target,$token) + ." +". + &Apache::edit::insertlist($target,$token). + " +\n". + &Apache::edit::editfield($token->[1],$text,"",50,4); } if ($target eq 'modified') { $text=&Apache::lonxml::get_all_text("endouttext",$$parser['-1']); @@ -377,7 +507,7 @@ sub end_startouttext { sub start_endouttext { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result=''; - if ($target eq "edit" ) { $result=&Apache::edit::tag_end($target,$token); } + if ($target eq "edit" ) { $result="".&Apache::edit::end_table()."\n"; } if ($target eq "modified") { $result=''; } return $result; } @@ -387,7 +517,19 @@ sub end_endouttext { if ($target eq "edit" || $target eq 'modified') { @result=('','no'); } return (@result); } - +sub delete_startouttext { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; +# my $text=&Apache::lonxml::get_all_text("endouttext",$$parser['-1']); + my $text=$$parser['-1']->get_text("/endouttext"); + my $token=$$parser['-1']->get_token(); + &Apache::lonxml::debug("Deleting :$text: and :$token->[0]:$token->[1]:$token->[2]: for startouttext"); + &Apache::lonxml::end_tag($tagstack,$parstack,$token); + # Deleting 2 parallel tag pairs, but we need the numbers later to look like + # they did the last time round + &Apache::lonxml::increasedepth($token); + &Apache::lonxml::decreasedepth($token); + return 1; +} 1; __END__