--- loncom/homework/structuretags.pm 2001/10/30 19:18:15 1.71 +++ loncom/homework/structuretags.pm 2003/02/25 23:18:22 1.150 @@ -1,22 +1,50 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document +# +# $Id: structuretags.pm,v 1.150 2003/02/25 23:18:22 albertel Exp $ +# +# Copyright Michigan State University Board of Trustees +# +# This file is part of the LearningOnline Network with CAPA (LON-CAPA). +# +# LON-CAPA is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# LON-CAPA is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with LON-CAPA; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# /home/httpd/html/adm/gpl.txt +# +# http://www.lon-capa.org/ +# # 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; +use Apache::File(); +use Apache::lonmenu; -sub BEGIN { +BEGIN { &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')) } 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; } @@ -29,9 +57,9 @@ 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 + return $bodytext.' '; } return ''; } @@ -42,25 +70,117 @@ sub end_tex { 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='ambiguous reference, submissions ignored $help
"; + $body_tag_start.=$help; + } } } - $body_tag_start.='>'; - return ($result,$head_tag_start,$body_tag_start); + my $form_tag_start; + if (!defined($found{'form'})) { + $form_tag_start='
'; + } + return ($result,$head_tag_start,$body_tag_start,$form_tag_start); +} + +#use Time::HiRes(); +sub get_resource_name { + my ($parstack,$safeeval)=@_; + my $name=&Apache::lonnet::gettitle(); + if ($name eq '') { + $name=&Apache::lonnet::EXT('resource.title'); + if ($name eq 'con_lost') { $name = ''; } + } + $Apache::lonhomework::name=$name; + return $name; +} + +sub setup_rndseed { + my ($safeeval)=@_; + my $rndseed; + if ($ENV{'request.state'} eq "construct") { + $rndseed=$ENV{'form.rndseed'}; + if (!$rndseed) { + $rndseed=time; + $ENV{'form.rndseed'}=$rndseed; + } + &Apache::lonxml::debug("Setting rndseed to $rndseed"); + &Apache::run::run('$external::randomseed='.$rndseed.';',$safeeval); + } + return $rndseed; +} + +sub problem_edit_header { + return ' + + + +
+ +

 

+ '; +} + +sub problem_edit_footer { + return '

+ '; +} + +sub problem_web_to_edit_header { + my ($rndseed)=@_; + my $result.=' + + + Random Seed: + + +
'; + return $result; } sub initialize_storage { @@ -68,7 +188,7 @@ sub initialize_storage { my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser(); if ($ENV{'request.state'} eq 'construct') { %Apache::lonhomework::history= - &Apache::lonnet::restore($ENV{'request.uri'},'nohist_construct',$domain,$name); + &Apache::lonnet::tmprestore($ENV{'request.uri'},'',$domain,$name); my ($temp)=keys %Apache::lonhomework::history ; &Apache::lonxml::debug("Return message of $temp"); } else { @@ -90,9 +210,8 @@ sub finalize_storage { if ( $temp ne '' ) { my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser(); if ($ENV{'request.state'} eq 'construct') { - $result=&Apache::lonnet::cstore(\%Apache::lonhomework::results, - $ENV{'request.uri'},'nohist_construct', - $domain,$name); + $result=&Apache::lonnet::tmpstore(\%Apache::lonhomework::results, + $ENV{'request.uri'},'',$domain,$name); &Apache::lonxml::debug('Construct Store return message:'.$result); } else { $result=&Apache::lonnet::cstore(\%Apache::lonhomework::results, @@ -111,11 +230,10 @@ 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 } @@ -123,13 +241,26 @@ ENDCHECKOUT sub start_problem { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + # meta is called from lonpublisher, which doesn't uses the normal + # lonhomework method of parsing the file which means that inputtags + # won't get reset + if ( $Apache::inputtags::part ne '' && $target != 'meta' ) { + &Apache::lonxml::error('Only one problem allowed in a .problem file'); + my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser); + return ''; + } #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 ($target ne 'analyze') { + &initialize_storage(); + if ($target eq 'web') { + &Apache::lonhomework::showhash(%Apache::lonhomework::history); + } + $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+)$/) { @@ -148,11 +279,12 @@ sub start_problem { my $accessmsg; #should get back a or the neccesary stuff to start XML/MathML - my ($result,$head_tag_start,$body_tag_start)= + my ($result,$head_tag_start,$body_tag_start,$form_tag_start)= &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval); + if ($target eq 'tex' and $ENV{'request.symb'} =~ m/\.page_/) { $result = '';} - - if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') { + if ($target eq 'analyze') { my $rndseed=&setup_rndseed($safeeval); } + if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') { #handle exam checkout if ($Apache::lonhomework::type eq 'exam') { my $token=$Apache::lonhomework::history{"resource.0.outtoken"}; @@ -164,54 +296,49 @@ sub start_problem { } #handle rand seed in construction space - my $rndseed; - if ($ENV{'request.state'} eq "construct") { - $rndseed=$ENV{'form.rndseed'}; - if (!$rndseed) { - $rndseed=time; - $ENV{'form.rndseed'}=$rndseed; - } - &Apache::run::run('$external::randomseed='.$rndseed.';',$safeeval); - } + my $rndseed=&setup_rndseed($safeeval); ($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); + &Apache::lonxml::debug("Got $status"); if (( $status eq 'CLOSED' ) || ( $status eq 'UNCHECKEDOUT') || - ( $status eq 'BANNED')) { - my $bodytext=&Apache::lonxml::get_all_text("/problem",$$parser[$#$parser]); + ( $status eq 'BANNED') || + ( $status eq 'UNAVAILABLE')) { + my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser); if ( $target eq "web" ) { $result.= $head_tag_start.''; - my $msg=$body_tag_start. - '

Not open to be viewed

'; + my $msg=$body_tag_start; + if ($status eq 'UNAVAILABLE') { + $result.='

Unable to determine if this resource is open due to network problems. Please try again later.

'; + } else { + $result.='

Not open to be viewed

'; + } if ($status eq 'CLOSED') { $msg.='The problem '.$accessmsg; } elsif ($status eq 'UNCHECKEDOUT') { $msg.=&checkout_msg; } $result.=$msg.'
'; + } elsif ($target eq 'tex') { + $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 { + $result.="Problem is not open to be viewed. It $accessmsg \\vskip 0 mm "; + } } } elsif ($target eq 'web') { - my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval); - if ($name eq '') { - $name=&Apache::lonnet::EXT('resource.title'); - if ($name eq 'con_lost') { $name = ''; } - } - $Apache::lonhomework::name=$name; + my $name= &get_resource_name($parstack,$safeeval); if ($status eq 'CAN_ANSWER') { # create a page header and exit - $result.="$head_tag_start$name\n - $body_tag_start\n -
". + $result.="$head_tag_start$name + $body_tag_start \n $form_tag_start". ''; if ($ENV{'request.state'} eq "construct") { - $result.= - ' - - Random Seed:
'; + $result.= &problem_web_to_edit_header($rndseed); } # if we are viewing someone else preserve that info if (defined $ENV{'form.grade_symb'}) { @@ -221,21 +348,53 @@ sub start_problem { } } } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER' - || $status eq 'CLOSED') { + || $status eq 'CLOSED' || $status eq 'UNAVALAILABLE') { $result.=$head_tag_start. "$name\n$body_tag_start\n"; } + } elsif ($target eq 'tex') { + my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval); + if ($name eq '') { + $name=&Apache::lonnet::EXT('resource.title'); + if ($name eq 'con_lost') { $name = ''; } + } + $Apache::lonhomework::name=$name; + my $id = $Apache::inputtags::part; + my $duedate = &Apache::lonnet::EXT("resource.$id.duedate"); + $duedate = POSIX::strftime("%c",localtime($duedate)); + my $temp_file; + my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.due"; + if (-e $filename) { + $temp_file = Apache::File->new($filename); + } else { + $temp_file = Apache::File->new('>>'.$filename); + } + my @due_file_content = <$temp_file>; + my $due_file_content = $due_file_content[$#due_file_content]; + chomp $due_file_content; + if ($due_file_content ne $duedate) { + $temp_file = Apache::File->new('>'.$filename); + print $temp_file "$duedate\n"; + if (not $ENV{'request.symb'} =~ m/\.page_/) { + if(not $duedate=~m/1969/) { + $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}'; + } + } else { + $result .= '\vskip 1mm\textit{Due date: '.$duedate.'} \\\\\\\\'; + } + } else { + if (not $ENV{'request.symb'} =~ m/\.page_/) { + $result .= '\begin{document} \noindent \vskip 1 mm\noindent\begin{minipage}{\textwidth}'; + } else { + $result .= '\vskip 1mm \\\\\\\\'; + } + } } } elsif ($target eq 'edit') { - $result.=$head_tag_start."".$body_tag_start. - ' - - - -
-
- '; + $result.=$head_tag_start."".$body_tag_start.$form_tag_start. + &problem_edit_header(); my $temp=&Apache::edit::insertlist($target,$token); $result.=$temp; } elsif ($target eq 'modified') { @@ -252,91 +411,137 @@ sub end_problem { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result=''; my $status=$Apache::inputtags::status['-1']; - if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ) { - if ( $target eq 'grade' && $Apache::inputtags::part eq '0' && - $status eq 'CAN_ANSWER') { + if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex') { + if ( $target eq 'grade' && $Apache::inputtags::part eq '0' && $status eq 'CAN_ANSWER' ) { # if part is zero, no s existed, so we need to the grading &Apache::inputtags::grade; - } elsif ( $target eq 'web' && $Apache::inputtags::part eq '0') { + } elsif ( ($target eq 'web' || $target eq 'tex') && $Apache::inputtags::part eq '0' && + $status ne 'UNCHECKEDOUT') { # if part is zero, no s existed, so we need show the current # grading status - $result.= &Apache::inputtags::gradestatus($Apache::inputtags::part); + my $gradestatus = &Apache::inputtags::gradestatus($Apache::inputtags::part,$target); + if ($Apache::lonhomework::type ne 'exam') {$result.= $gradestatus;} } if ( - ($target eq 'web' && ($ENV{'request.state'} ne 'construct')) || - ($target eq 'answer') + (($target eq 'web') && ($ENV{'request.state'} ne 'construct')) || + ($target eq 'answer') || ($target eq 'tex') ) { if ($status eq 'CAN_ANSWER') { - $result.="\n"; - } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') { - $result.="\n"; + if ($target ne 'tex') { + $result.="\n"; + } + } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER' || + $status eq 'UNCHECKEDOUT' ) { + if ($target ne 'tex') { + $result.="\n"; + } + } + if ($target eq 'web') { + $result.=&Apache::lonxml::xmlend(); + } elsif ($target eq 'tex') { + $result .= '\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}'; + if (not $ENV{'request.symb'} =~ m/\.page_/) { + $result .= '\end{minipage}\end{document} '; + } else { + $result .= ''; + } } - $result.=&Apache::lonxml::xmlend(); } if ($target eq 'grade') { &Apache::lonhomework::showhash(%Apache::lonhomework::results); &finalize_storage(); } + if ($target eq 'answer' && ($ENV{'request.state'} eq 'construct') ) { + $result.=''; #normally we get it from xmlend, but in CSTR + # we always show answer mode too. + } } 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='
'; + $result = &problem_edit_footer(); } 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); + my ($result,$head_tag_start,$body_tag_start,$form_tag_start); + if ($target eq 'edit') { - $result.=$head_tag_start."".$body_tag_start. - '
- - - -
- '; + ($result,$head_tag_start,$body_tag_start,$form_tag_start)= + &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval); + $result.=$head_tag_start."".$body_tag_start.$form_tag_start. + &problem_edit_header(); my $temp=&Apache::edit::insertlist($target,$token); $result.=$temp; - return $result; - } - if ($target eq 'modified') { + } elsif ($target eq 'modified') { $result=$token->[4]; $result.=&Apache::edit::handle_insert(); - return $result; + } elsif ($target eq 'web' && $$tagstack[0] ne 'problem' && + $ENV{'request.state'} eq "construct" ) { + ($result,$head_tag_start,$body_tag_start,$form_tag_start)= + &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval); + my $name=&get_resource_name($parstack,$safeeval); + my $rndseed=&setup_rndseed($safeeval); + $result.="$head_tag_start$name + $body_tag_start \n $form_tag_start". + ''; + $result.=&problem_web_to_edit_header($rndseed); } - return ''; + return $result; } sub end_library { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result=''; if ($target eq 'edit') { - $result='
'; + $result=&problem_edit_footer(); + } elsif ($target eq 'web' && $$tagstack[0] ne 'problem' && + $ENV{'request.state'} eq "construct") { + $result.='
'.&Apache::lonxml::xmlend(); } return $result; } sub start_block { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') { - my $code = @$parstack[$#$parstack]; - $code =~ s/\"//g; - $code .=';return $condition;'; - # print "
$code
"; - my $result = &Apache::run::run($code,$safeeval); - &Apache::lonxml::debug("block :$code: returned :$result:"); - if ( ! $result ) { - my $skip=&Apache::lonxml::get_all_text("/block",$$parser[$#$parser]); - &Apache::lonxml::debug("skipping ahead :$skip: $$parser[$#$parser]"); + my $result; + + if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || + $target eq 'tex' || $target eq 'analyze') { + my $code = @$parstack[$#$parstack]; + if ($code) { + $code =~ s/\"//g; + $code .=';return $condition;'; + if (!$Apache::lonxml::default_homework_loaded) { + &Apache::lonxml::default_homework_load($safeeval); + } + $result = &Apache::run::run($code,$safeeval); + &Apache::lonxml::debug("block :$code: returned :$result:"); + } else { + $result='1'; + } + if ( ! $result ) { + my $skip=&Apache::lonxml::get_all_text("/block",$parser); + &Apache::lonxml::debug("skipping ahead :$skip: $$parser[-1]"); + } + $result=''; + } elsif ($target eq 'edit') { + $result .=&Apache::edit::tag_start($target,$token); + $result .=&Apache::edit::text_arg('Test Condition:','condition', + $token,40); + $result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); + } elsif ($target eq 'modified') { + my $constructtag=&Apache::edit::get_new_args($token,$parstack, + $safeeval,'condition'); + if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } } - } - return ""; + return $result; } sub end_block { @@ -351,6 +556,9 @@ sub start_while { $code .=';return $condition;'; push( @Apache::structuretags::whileconds, $code); + if (!$Apache::lonxml::default_homework_loaded) { + &Apache::lonxml::default_homework_load($safeeval); + } my $result = &Apache::run::run($code,$safeeval); my $bodytext=$$parser[$#$parser]->get_text("/while"); push( @Apache::structuretags::whilebody, $bodytext); @@ -371,7 +579,7 @@ sub end_while { return ""; } -# +# # .. # .. # .. @@ -379,8 +587,10 @@ sub end_while { # sub start_randomlist { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - if ($target eq 'answer' || $target eq 'grade' || $target eq 'web') { - my $body= &Apache::lonxml::get_all_text("/randomlist",$$parser[$#$parser]); + 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); my $b_parser= HTML::TokeParser->new(\$body); my $b_tok; my @randomlist; @@ -403,16 +613,27 @@ sub start_randomlist { # print "END-TAG $b_tok->[1]
"; # } } - my @idx_arr = (0 .. $#randomlist); &Apache::structuretags::shuffle(\@idx_arr); my $bodytext = ''; - for(0 .. $#randomlist) { + my $show=$#randomlist; + my $showarg=&Apache::lonxml::get_param('show',$parstack,$safeeval); + $showarg--; + if ( ($showarg >= 0) && ($showarg < $show) ) { $show = $showarg; } + for(0 .. $show) { $bodytext .= "$randomlist[ $idx_arr[$_] ]"; } &Apache::lonxml::newparser($parser,\$bodytext); + } elsif ($target eq 'edit' ) { + $result .= &Apache::edit::tag_start($target,$token); + $result .= &Apache::edit::text_arg('Maximum Tags to Show:','show',$token,5); + $result .= &Apache::edit::end_row().&Apache::edit::start_spanning_row(); + } elsif ($target eq 'modified' ) { + my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval, + 'show'); + if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } } - return ""; + return $result; } sub shuffle { @@ -421,7 +642,7 @@ sub shuffle { if (defined(@$a)) { &Apache::response::setrandomnumber(); for($i=@$a;--$i;) { - my $j=int rand($i+1); + my $j=int(&Math::Random::random_uniform() * ($i+1)); next if $i == $j; @$a[$i,$j] = @$a[$j,$i]; } @@ -429,55 +650,95 @@ sub shuffle { } sub end_randomlist { - return ''; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my $result; + if ($target eq 'edit' ) { + $result=&Apache::edit::tag_end($target,$token,'End Randomly Parsed Block'); + } + return $result; } sub start_part { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my $result=''; 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=(); + 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') { - 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" ) { - return "
Part is not open to be viewed. It $accessmsg
"; + } 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). + &Apache::loncommon::help_open_topic("Part_Tag_Edit_Help"). + &Apache::edit::end_row().&Apache::edit::start_spanning_row(); + + } elsif ($target eq 'modified') { + my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval, + 'id'); + if ($constructtag) { + $result = &Apache::edit::rebuild_tag($token); + $result.=&Apache::edit::handle_insert(); } - } } - return ''; + return $result; } sub end_part { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; &Apache::lonxml::debug("in end_part $target "); 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 'web') { - return &Apache::inputtags::gradestatus($Apache::inputtags::part); + 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' && !$hidden) { + $result=&Apache::inputtags::grade; + } elsif (($target eq 'web' || $target eq 'tex') && !$hidden ) { + my $gradestatus=&Apache::inputtags::gradestatus($Apache::inputtags::part, + $target); + if ($Apache::lonhomework::type eq 'exam') {$gradestatus='';} + $result=$gradestatus; } - return ''; + pop @Apache::inputtags::status; + return $result; } sub start_preduedate { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') { + if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') { if ($Apache::inputtags::status['-1'] ne 'CAN_ANSWER' && - $Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER' ) { - &Apache::lonxml::get_all_text("/preduedate",$$parser[$#$parser]); + $Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER' && + $Apache::inputtags::status['-1'] ne 'SHOW_ANSWER') { + &Apache::lonxml::get_all_text("/preduedate",$parser); } } return ''; @@ -489,10 +750,12 @@ sub end_preduedate { sub start_postanswerdate { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - if ($target eq 'web' || $target eq 'grade') { + 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'; } return ''; } @@ -503,12 +766,12 @@ sub end_postanswerdate { sub start_notsolved { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') { + if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') { my $gradestatus=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"}; &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 ''; @@ -520,10 +783,10 @@ sub end_notsolved { sub start_solved { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') { + 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 ''; @@ -545,28 +808,39 @@ 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). - " -\n". - &Apache::edit::editfield($token->[1],$text,"",50,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') { + $result .= '\noindent '; + } return $result; } sub start_endouttext { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result=''; if ($target eq "edit" ) { $result="".&Apache::edit::end_table()."\n"; } - if ($target eq "modified") { $result=''; } + if ($target eq "modified") { + $result=''. + &Apache::edit::handle_insertafter('startouttext'); } return $result; } sub end_endouttext { @@ -577,7 +851,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");