--- loncom/homework/structuretags.pm 2003/08/30 02:33:25 1.207 +++ loncom/homework/structuretags.pm 2003/11/21 20:21:20 1.226 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: structuretags.pm,v 1.207 2003/08/30 02:33:25 albertel Exp $ +# $Id: structuretags.pm,v 1.226 2003/11/21 20:21:20 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -36,6 +36,7 @@ use strict; use Apache::lonnet; use Apache::File(); use Apache::lonmenu; +use Apache::lonlocal; BEGIN { &Apache::lonxml::register('Apache::structuretags',('block','languageblock','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext', @@ -114,7 +115,7 @@ sub page_start { &Apache::lonxml::whichuser(); if ($symb eq '' && !$publicuser) { my $help = &Apache::loncommon::help_open_topic("Ambiguous_Reference"); - $help="Browsing resource, all submissions are temporary.
"; + $help=&mt("Browsing resource, all submissions are temporary.")."
"; $body_tag_start.=$help; } } @@ -159,8 +160,8 @@ sub setup_rndseed { $ENV{'form.rndseed'}=$rndseed; } } - if ($ENV{'form.resetdata'} eq 'New Problem Variation' || - $ENV{'form.newrandomization'} eq 'New Randomization') { + if ($ENV{'form.resetdata'} eq &mt('New Problem Variation') || + $ENV{'form.newrandomization'} eq &mt('New Randomization')) { srand(time); $rndseed=int(rand(2100000000)); $ENV{'form.rndseed'}=$rndseed; @@ -170,51 +171,54 @@ sub setup_rndseed { if (defined($rndseed) && $rndseed ne int($rndseed)) { $rndseed=join(',',&Math::Random::random_seed_from_phrase($rndseed)); } - &Apache::lonxml::debug("Setting rndseed to $rndseed"); - &Apache::run::run('$external::randomseed='.$rndseed.';',$safeeval); + if ($safeeval) { + &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 '

- '; + return '

+ '; } sub problem_web_to_edit_header { my ($rndseed)=@_; - my $result.=' - - - - - + my $result.=' + + + + + '.&mt(' Show All Foils').'
'; my $numtoanalyze=$ENV{'form.numtoanalyze'}; if (!$numtoanalyze) { $numtoanalyze=20; } - $result.= ' for + $result.= ' for versions of this problem.'. - &Apache::loncommon::help_open_topic("Analyze_Problem", + $numtoanalyze.'" size="5" /> '.&mt('versions of this problem'). + '.'.&Apache::loncommon::help_open_topic("Analyze_Problem", '',undef,undef,300). - '
'; + '
'; return $result; } @@ -260,17 +264,21 @@ sub finalize_storage { } sub checkout_msg { + my %lt=&Apache::lonlocal::texthash( + 'resource'=>'The resource needs to be checked out', + 'id_expln'=>'As a resource gets checked out, a unique timestamped ID is given to it, and a permanent record is left in the system.', + 'warning'=>'Checking out resources is subject to course policies, and may exclude future credit even if done erroneously.', + 'checkout'=>'Check out Exam for Viewing', + 'checkout?'=>'Check out Exam?'); return (<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.

+

$lt{'resource'}

+

$lt{'id_expln'}

+ +

$lt{'warning'}
- +
ENDCHECKOUT } @@ -306,7 +314,9 @@ sub reset_problem_globals { undef(%Apache::lonhomework::history); undef(%Apache::lonhomework::results); undef($Apache::inputtags::part); - undef($Apache::lonhomework::parsing_a_problem); +#don't undef this, lonhomework.pm takes care of this, we use this to +#detect if we try to do 2 problems in one file +# undef($Apache::lonhomework::parsing_a_problem); undef($Apache::lonhomework::name); } @@ -347,7 +357,7 @@ sub start_problem { } #added vars to the scripting enviroment - my $expression='$external::part='.$Apache::inputtags::part.';'; + my $expression='$external::part=\''.$Apache::inputtags::part.'\';'; &Apache::run::run($expression,$safeeval); my $status; my $accessmsg; @@ -379,7 +389,7 @@ sub start_problem { $form_tag_start.=''. ''. + value="'.&mt('New Problem Variation').'" />'. '
'; } @@ -392,17 +402,18 @@ sub start_problem { if (( $status eq 'CLOSED' ) || ( $status eq 'UNCHECKEDOUT') || ( $status eq 'BANNED') || - ( $status eq 'UNAVAILABLE')) { + ( $status eq 'UNAVAILABLE') || + ( $status eq 'INVALID_ACCESS')) { my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser); if ( $target eq "web" ) { $result.= $head_tag_start.''; 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.

'; + $result.='

'.&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'

'; } else { - $result.='

Not open to be viewed

'; + $result.='

'.&mt('Not open to be viewed').'

'; } - if ($status eq 'CLOSED') { + if ($status eq 'CLOSED' || $status eq 'INVALID_ACCESS') { $msg.='The problem '.$accessmsg; } elsif ($status eq 'UNCHECKEDOUT') { $msg.=&checkout_msg; @@ -411,9 +422,9 @@ sub start_problem { } 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 '; + $result.=&mt('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 "; + $result.=&mt('Problem is not open to be viewed. It')." $accessmsg \\vskip 0 mm "; } } } elsif ($target eq 'web') { @@ -434,7 +445,8 @@ sub start_problem { } } } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER' - || $status eq 'CLOSED' || $status eq 'UNAVALAILABLE') { + || $status eq 'CLOSED' || $status eq 'UNAVALAILABLE' || + $status eq 'INVALID_ACCESS') { $result.=$head_tag_start. "$name\n$body_tag_start\n"; } @@ -445,12 +457,12 @@ sub start_problem { } my $id = $Apache::inputtags::part; my $weight = &Apache::lonnet::EXT("resource.$id.weight"); - my $allkeys=&Apache::lonnet::metadata($ENV{'request.uri'},'keys'); - my @allkeys = split /,/,$allkeys; + my $packages=&Apache::lonnet::metadata($ENV{'request.uri'},'packages'); + my @packages = split /,/,$packages; my $allow_print_points = 0; - foreach my $partial_key (@allkeys) { - if ($partial_key=~m/weight/) { - $allow_print_points++; + foreach my $partial_key (@packages) { + if ($partial_key=~m/part_0/) { + $allow_print_points=1; } } my $duedate = &Apache::lonnet::EXT("resource.$id.duedate"); @@ -491,6 +503,8 @@ sub start_problem { } elsif ($target eq 'edit') { $result.=$head_tag_start."".$body_tag_start.$form_tag_start. &problem_edit_header(); + $Apache::lonxml::warnings_error_header= + &mt("Editor Errors - these errors might not effect the running of the problem, but they will likely cause problems with further use of the Edit mode. Please use the EditXML mode to fix these errors.")."
"; my $temp=&Apache::edit::insertlist($target,$token); $result.=$temp; } elsif ($target eq 'modified') { @@ -531,7 +545,7 @@ sub end_problem { $result.="\n"; } } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER' || - $status eq 'UNCHECKEDOUT' ) { + $status eq 'UNCHECKEDOUT' || $status eq 'INVALID_ACCESS') { if ($target ne 'tex' && $ENV{'form.answer_output_mode'} ne 'tex') { $result.="\n"; @@ -566,6 +580,7 @@ sub end_problem { @Apache::inputtags::response=(); $result=&Apache::response::mandatory_part_meta; } + $result.=&Apache::response::meta_part_order(); } elsif ($target eq 'edit') { &Apache::lonxml::debug("in end_problem with $target, edit"); $result = &problem_edit_footer(); @@ -720,9 +735,9 @@ sub start_languageblock { $result=''; } elsif ($target eq 'edit') { $result .=&Apache::edit::tag_start($target,$token); - $result .=&Apache::edit::text_arg('Include Language:','include', + $result .=&Apache::edit::text_arg(&mt('Include Language:'),'include', $token,40); - $result .=&Apache::edit::text_arg('Exclude Language:','exclude', + $result .=&Apache::edit::text_arg(&mt('Exclude Language:'),'exclude', $token,40); $result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); } elsif ($target eq 'modified') { @@ -795,7 +810,7 @@ sub start_while { } } elsif ($target eq 'edit') { $result .=&Apache::edit::tag_start($target,$token); - $result .=&Apache::edit::text_arg('Test Condition:','condition', + $result .=&Apache::edit::text_arg(&mt('Test Condition:'),'condition', $token,40); $result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); } elsif ($target eq 'modified') { @@ -827,7 +842,7 @@ sub end_while { $return = &Apache::run::run($code,$safeeval); } if ($error) { - &Apache::lonxml::error('
Code ran too long. It ran for more than '.$Apache::lonnet::perlvar{'lonScriptTimeout'}.' seconds occured while running <while$gt; on line '.$line.'
'); + &Apache::lonxml::error('
'.&mt('Code ran too long. It ran for more than').' '.$Apache::lonnet::perlvar{'lonScriptTimeout'}.' '.&mt('seconds occured while running <while$gt; on line').' '.$line.'
'); } } elsif ($target eq "edit") { $result.= &Apache::edit::tag_end($target,$token,''); @@ -931,9 +946,13 @@ sub start_part { $Apache::lonhomework::problemstatus= &Apache::lonnet::EXT("resource.$id.problemstatus"); my $hidden=&Apache::loncommon::check_if_partid_hidden($Apache::inputtags::part); + my $expression='$external::part=\''.$Apache::inputtags::part.'\';'; + &Apache::run::run($expression,$safeeval); if ($target eq 'meta') { - return &Apache::response::mandatory_part_meta; + my $display=&Apache::lonxml::get_param('display',$parstack,$safeeval); + return &Apache::response::mandatory_part_meta. + &Apache::response::meta_parameter_write('display','string',$display,'Part Description'); } elsif ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') { if ($hidden) { @@ -944,15 +963,19 @@ sub start_part { my $expression='$external::datestatus="'.$status.'";'; $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.$id.solved"}.'";'; &Apache::run::run($expression,$safeeval); - if ( $status eq 'CLOSED' ) { + if (( $status eq 'CLOSED' ) || + ( $status eq 'UNCHECKEDOUT') || + ( $status eq 'BANNED') || + ( $status eq 'UNAVAILABLE') || + ( $status eq 'INVALID_ACCESS')) { my $bodytext=&Apache::lonxml::get_all_text("/part",$parser); if ( $target eq "web" ) { - $result="
Part is not open to be viewed. It $accessmsg
"; + $result="
".&mt('Part is not open to be viewed. It')." $accessmsg
"; } elsif ( $target eq 'tex' ) { if (not $ENV{'form.problem_split'}=~/yes/) { - $result="\\end{minipage}\\vskip 0 mm Part is not open to be viewed. It $accessmsg \\\\\\begin{minipage}{\\textwidth}"; + $result="\\end{minipage}\\vskip 0 mm ".&mt('Part is not open to be viewed. It')." $accessmsg \\\\\\begin{minipage}{\\textwidth}"; } else { - $result="\\vskip 0 mm Part is not open to be viewed. It $accessmsg \\\\"; + $result="\\vskip 0 mm ".&mt('Part is not open to be viewed. It')." $accessmsg \\\\"; } } } else { @@ -961,7 +984,15 @@ sub start_part { $result.='\noindent \end{minipage}\vskip 0 mm \noindent \begin{minipage}{\textwidth}\noindent'; } my $weight = &Apache::lonnet::EXT("resource.$id.weight"); - if ($Apache::lonhomework::type eq 'exam') { $result .= '\fbox{\textit{'.$weight.' pt}}';} + my $allkeys=&Apache::lonnet::metadata($ENV{'request.uri'},'keys'); + my @allkeys = split /,/,$allkeys; + my $allow_print_points = 0; + foreach my $partial_key (@allkeys) { + if ($partial_key=~m/\_(\d*)\_weight/) { + if ($1 ne '0') {$allow_print_points=1;} + } + } + if (($Apache::lonhomework::type eq 'exam') && ($allow_print_points)) { $result .= '\fbox{\textit{'.$weight.' pt}}';} } } } @@ -969,11 +1000,15 @@ sub start_part { $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::text_arg('Displayed Part Description:','display',$token). &Apache::edit::end_row().&Apache::edit::start_spanning_row(); } elsif ($target eq 'modified') { my $constructtag=&Apache::edit::get_new_args($token,$parstack, - $safeeval,'id'); + $safeeval,'id','display'); if ($constructtag) { + #limiting ids to only letters numbers, and space + $token->[2]->{'id'}=~s/[^A-Za-z0-9 ]//gs; $result = &Apache::edit::rebuild_tag($token); $result.=&Apache::edit::handle_insert(); } @@ -994,7 +1029,9 @@ sub end_part { } elsif (($target eq 'web' || $target eq 'tex') && !$hidden ) { my $gradestatus=&Apache::inputtags::gradestatus($Apache::inputtags::part, $target); - if ($Apache::lonhomework::type eq 'exam') {$gradestatus='';} + if ($Apache::lonhomework::type eq 'exam' && $target eq 'tex') { + $gradestatus=''; + } $result=$gradestatus; } elsif ($target eq 'edit') { $result=&Apache::edit::end_table(); @@ -1084,8 +1121,8 @@ sub end_startouttext { if ($target eq 'edit') { $text=&Apache::lonxml::get_all_text("endouttext",$parser); - $result.=&Apache::edit::start_table($token)."Text Block -Delete:". + $result.=&Apache::edit::start_table($token)."".&mt('Text Block')." +".&mt('Delete:'). &Apache::edit::deletelist($target,$token) ." ". @@ -1096,8 +1133,7 @@ sub end_startouttext { &Apache::edit::editfield($token->[1],$text,"",80,4); } if ($target eq 'modified') { - $text=&Apache::lonxml::get_all_text("endouttext",$parser); - $result=''.&Apache::edit::modifiedfield(); + $result=''.&Apache::edit::modifiedfield("endouttext",$parser); } if ($target eq 'tex') { $result .= '\noindent '; @@ -1141,10 +1177,10 @@ sub start_simpleeditbutton { my $result=''; if (($target eq 'web') && (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) { - my $url=$ENV{'REQUEST_URI'}; + my $url=$ENV{'request.noversionuri'}; $url=~s/\?.*$//; $result='
'. - 'Simple Problem Editor - Note: it can take up to 10 minutes for changes to take effect for all users.'. + ''.&mt('Simple Problem Editor').' - '.&mt('Note: it can take up to 10 minutes for changes to take effect for all users.'). &Apache::loncommon::help_open_topic('Caching').'

'; } return $result;