--- loncom/homework/structuretags.pm 2001/04/26 21:27:15 1.35 +++ loncom/homework/structuretags.pm 2001/05/13 20:01:34 1.37 @@ -8,6 +8,7 @@ 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_insert('problem','',('part','postanswerdate','preduedate')) } sub start_web { @@ -46,6 +47,9 @@ sub start_problem { &Apache::run::run($expression,$safeeval); my $status; my $datemsg; + + my $result=&Apache::londefdef::start_html($target,$token,$parstack,$parser,$safeeval); + if ($target eq 'web' || $target eq 'grade') { ($status,$datemsg) = &Apache::lonhomework::check_date('0'); push (@Apache::inputtags::status,$status); @@ -55,7 +59,7 @@ sub start_problem { if ( $status eq 'CLOSED' ) { my $bodytext=&Apache::lonxml::get_all_text("/problem",$$parser[$#$parser]); if ( $target eq "web" ) { - return "
Problem is not open to be viewed. The problem $datemsg
"; + return $result."
Problem is not open to be viewed. The problem $datemsg
"; } } } @@ -70,17 +74,35 @@ sub start_problem { $Apache::lonhomework::name=$name; if ($status eq 'CAN_ANSWER') { # create a page header and exit - return "$name\n\n
".''; + $result.="$name\n + \n + ". + ''; + if ($ENV{'request.state'} eq "construct") { + $result.=' +
'; + } + return $result; } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER' || $status eq 'CLOSED') { - return "$name\n\n"; + return $result."$name\n\n"; } } if ($target eq 'edit') { - return ' + $result.=' - + + +
'; + my $temp=&Apache::edit::insertlist($token,$target); + $result.=$temp; + return $result; + } + if ($target eq 'modified') { + $result=$token->[4]; + $result.=&Apache::edit::handle_insert(); + return $result; } return ''; } @@ -232,7 +254,7 @@ sub start_part { @Apache::inputtags::responselist = (); if ($target eq 'meta') { return &Apache::response::mandatory_part_meta; - } else { + } elsif ($target eq 'web' || $target eq 'grade') { my ($status,$datemsg) = &Apache::lonhomework::check_date("OPEN_DATE",$id); push (@Apache::inputtags::status,$status); my $expression='$external::datestatus="'.$status.'";'; @@ -254,10 +276,13 @@ sub end_part { my $status=$Apache::inputtags::status['-1']; pop @Apache::inputtags::status; if ( $target eq 'meta' ) { return ''; } - if ( $target eq 'grade' && $status eq 'CAN_ANSWER') { - return &Apache::inputtags::grade; + if ( $target eq 'grade' && $status eq 'CAN_ANSWER') { + return &Apache::inputtags::grade; + } + if ($target eq 'web') { + return &Apache::inputtags::gradestatus($Apache::inputtags::part); } - return &Apache::inputtags::gradestatus($Apache::inputtags::part); + return ''; } sub start_preduedate { @@ -335,8 +360,8 @@ sub end_startouttext { if ($target eq 'edit') { $text=&Apache::lonxml::get_all_text("endouttext",$$parser[$#$parser]); $result= - &Apache::edit::tag_start("outtext"). - &Apache::edit::editfield($token->[1],$text,"Text Block"); + &Apache::edit::tag_start($target,$token). + &Apache::edit::editfield($token->[1],$text,"Text Block",50,5); } if ($target eq 'modified') { $text=&Apache::lonxml::get_all_text("endouttext",$$parser['-1']); @@ -347,7 +372,7 @@ sub end_startouttext { sub start_endouttext { my ($target,$token,$parstack,$parser,$safeeval)=@_; my $result=''; - if ($target eq "edit" ) { $result=&Apache::edit::tag_end("outtext"); } + if ($target eq "edit" ) { $result=&Apache::edit::tag_end($target,$token); } if ($target eq "modified") { $result=''; } return $result; }