--- loncom/homework/structuretags.pm 2001/06/02 03:59:59 1.40 +++ loncom/homework/structuretags.pm 2001/08/22 19:21:36 1.66 @@ -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,8/20 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,73 @@ 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='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 } sub start_problem { @@ -41,27 +112,63 @@ sub start_problem { #intialize globals $Apache::inputtags::part='0'; @Apache::inputtags::responselist = (); + @Apache::inputtags::previous=(); + &initialize_storage(); + $Apache::lonhomework::type=&Apache::lonnet::EXT('resource.0.type'); + &Apache::lonxml::debug("Found this to be of type :$Apache::lonhomework::type:"); + if ($Apache::lonhomework::type eq '') { + my $uri=$ENV{'request.uri'}; + if ($uri=~/\.(\w+)$/) { + $Apache::lonhomework::type=$1; + &Apache::lonxml::debug("Using type of $1"); + } else { + $Apache::lonhomework::type='problem'; + &Apache::lonxml::debug("Using default type, problem, :$uri:"); + } + } -#adeed vars to the scripting enviroment +#added vars to the scripting enviroment my $expression='$external::part='.$Apache::inputtags::part.';'; &Apache::run::run($expression,$safeeval); my $status; - my $datemsg; - - my $result=&Apache::londefdef::start_html($target,$token,$tagstack,$parstack,$parser,$safeeval); + my $accessmsg; + #should get back a or the neccesary stuff to start XML/MathML + my ($result,$head_tag_start,$body_tag_start)= + &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval); + + 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(); + $Apache::lonhomework::history{"resource.0.outtoken"}=$token; + } + $body_tag_start.=&Apache::lonxml::printtokenheader($target,$token); + } + } 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" ) { - return $result."
Problem is not open to be viewed. The problem $datemsg
"; + $result.= $head_tag_start.''; + my $msg=$body_tag_start. + '

Not open to be viewed

'; + if ($status eq 'CLOSED') { + $msg.='The problem '.$accessmsg; + } elsif ($status eq 'UNCHECKEDOUT') { + $msg.=&checkout_msg; + } + return $result.$msg.'
'; } - } + } } if ($target eq 'web') { my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval); @@ -72,27 +179,35 @@ sub start_problem { $Apache::lonhomework::name=$name; if ($status eq 'CAN_ANSWER') { # create a page header and exit - $result.="$name\n - \n + $result.="$head_tag_start$name\n + $body_tag_start\n
". ''; if ($ENV{'request.state'} eq "construct") { $result.='
'; } + # if we are viewing someone else preserve that info + if (defined $ENV{'form.grade_symb'}) { + foreach my $field ('symb','courseid','domain','username') { + $result .= ''."\n"; + } + } return $result; } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER' || $status eq 'CLOSED') { - return $result."$name\n\n"; + return $result.$head_tag_start."$name\n$body_tag_start\n"; } } if ($target eq 'edit') { - $result.=' - - - - -
-'; + $result.=$head_tag_start."".$body_tag_start. + ' + + + +
+
+ '; my $temp=&Apache::edit::insertlist($target,$token); $result.=$temp; return $result; @@ -118,22 +233,58 @@ sub end_problem { # if part is zero, no s existed, so we need show the current # grading status $result.= &Apache::inputtags::gradestatus($Apache::inputtags::part); - } + } if ($target eq 'web') { if ($status eq 'CAN_ANSWER') { $result.="\n"; } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') { - $result.="\n"; - } + $result.="\n"; + } + $result.=&Apache::lonxml::xmlend(); } - } - if ($target eq 'meta') { + if ($target eq 'grade') { + &Apache::lonhomework::showhash(%Apache::lonhomework::results); + &finalize_storage(); + } + } elsif ($target eq 'meta') { if ($Apache::inputtags::part eq '0') { $result=&Apache::response::mandatory_part_meta; } + } elsif ($target eq 'edit') { + &Apache::lonxml::debug("in end_problem with $target, edit"); + $result='
'; } + 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') { - &Apache::lonxml::debug("in end_problem with $target, edit"); $result='
'; } return $result; @@ -235,6 +386,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; @@ -243,17 +395,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"}.'";'; @@ -261,7 +416,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
"; } } } @@ -357,9 +512,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']); @@ -370,7 +531,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; } @@ -380,7 +541,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__