--- loncom/homework/structuretags.pm 2004/06/03 16:42:02 1.255 +++ loncom/homework/structuretags.pm 2005/02/12 02:18:08 1.279 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: structuretags.pm,v 1.255 2004/06/03 16:42:02 www Exp $ +# $Id: structuretags.pm,v 1.279 2005/02/12 02:18:08 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -36,7 +36,7 @@ use Apache::File(); use Apache::lonmenu; use Apache::lonlocal; use Apache::lonxml; - +use Time::HiRes qw( gettimeofday tv_interval ); BEGIN { &Apache::lonxml::register('Apache::structuretags',('block','languageblock','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','problemtype','startouttext','endouttext','simpleeditbutton','definetag')); } @@ -83,13 +83,18 @@ sub page_start { $result=&Apache::londefdef::start_html($target,$token,$tagstack, $parstack,$parser,$safeeval); $head_tag_start=''.&Apache::lonmenu::registerurl(undef,$target). - &Apache::lonhtmlcommon::htmlareaheaders(); - @Apache::lonxml::htmlareafields=(); + &Apache::lonhtmlcommon::htmlareaheaders(). + &Apache::lonhtmlcommon::spellheader(). + &Apache::lonxml::fontsettings(); } my $body_tag_start; - if (!defined($found{'body'})) { - $body_tag_start=''; + $form_tag_start='
'; } return ($result,$head_tag_start,$body_tag_start,$form_tag_start); } @@ -135,7 +142,8 @@ sub get_resource_name { if (defined($Apache::lonhomework::name)) { return $Apache::lonhomework::name; } - my $name=&Apache::lonnet::gettitle(); + my ($symb)=&Apache::lonxml::whichuser(); + my $name=&Apache::lonnet::gettitle($symb); if ($name eq '') { $name=&Apache::lonnet::EXT('resource.title'); if ($name eq 'con_lost') { $name = ''; } @@ -184,18 +192,24 @@ sub setup_rndseed { return $rndseed; } +sub remember_problem_state { + return ' + + + '; +} + sub problem_edit_header { - return ' + return ''. + &Apache::structuretags::remember_problem_state().'
'. - &Apache::loncommon::help_open_topic('Problem_Editor_XML_Index', - 'Problem Editing Help').''. - &Apache::loncommon::help_open_faq(5). - &Apache::loncommon::help_open_bug('Authoring').'
'. + &Apache::loncommon::help_open_menu('','Problem Editing Help','Problem_Editor_XML_Index','',5,'Authoring',undef,undef,undef,'Problem Editing Help') + .''. '
'; } @@ -224,9 +238,9 @@ sub problem_web_to_edit_header { - + onchange="javascript:document.lonhomework.changerandseed.click()" /> Problem Status: - + ".&option('exam' ,'problemtype').&mt("Exam Problem")." ".&option('problem','problemtype').&mt("Homework problem")." ".&option('survey' ,'problemtype').&mt("Survey Question")." @@ -329,7 +343,7 @@ sub checkout_msg {

$lt{'warning'}

 - + @@ -343,7 +357,7 @@ sub firstaccess_msg { &Apache::lonxml::debug("map is $map title is $foldertitle"); return (<The resources in "$foldertitle" are open for a limited time. Once you click the 'Show Resource' button below you have $time to complete all resources "$foldertitle". -
+
@@ -356,12 +370,13 @@ sub init_problem_globals { if ($type eq 'problem') { $Apache::inputtags::part='0'; @Apache::inputtags::partlist=('0'); - - $Apache::lonhomework::problemstatus=&get_problem_status('0') - } else { + $Apache::lonhomework::problemstatus=&get_problem_status('0'); + $Apache::lonhomework::ignore_response_errors=0; + } elsif ($type eq 'library') { $Apache::inputtags::part=''; @Apache::inputtags::partlist=(); $Apache::lonhomework::problemstatus=''; + $Apache::lonhomework::ignore_response_errors=1; } @Apache::inputtags::responselist = (); @Apache::inputtags::importlist = (); @@ -397,12 +412,14 @@ sub set_problem_state { sub get_problem_status { my ($part)=@_; - my $problem_status=&Apache::lonnet::EXT("resource.$part.problemstatus"); - &Apache::lonxml::debug("problem status for $part is $problem_status"); - &Apache::lonxml::debug("env probstat is ".$ENV{'form.problemstatus'}); + my $problem_status; if ($ENV{'request.state'} eq 'construct' && defined($ENV{'form.problemstatus'})) { $problem_status=$ENV{'form.problemstatus'}; + } else { + $problem_status=&Apache::lonnet::EXT("resource.$part.problemstatus"); + &Apache::lonxml::debug("problem status for $part is $problem_status"); + &Apache::lonxml::debug("env probstat is ".$ENV{'form.problemstatus'}); } return $problem_status; } @@ -486,7 +503,16 @@ sub start_problem { ''. '
'; + value="'.$ENV{'form.username'}.'" />'; + if ($ENV{'user.adv'}) { + $form_tag_start.= + ' ; my $due_file_content = $due_file_content[$#due_file_content]; chomp $due_file_content; - my $name_of_resourse= &Apache::lonxml::latex_special_symbols(&get_resource_name($parstack,$safeeval)); + my $name_of_resourse= &Apache::lonxml::latex_special_symbols(&get_resource_name($parstack,$safeeval),'header'); if ($due_file_content ne $duedate) { $temp_file = Apache::File->new('>'.$filename); print $temp_file "$duedate\n"; @@ -647,11 +675,16 @@ sub end_problem { if (not $ENV{'form.problem_split'}=~/yes/) { $endminipage = '\end{minipage}'; } - $result .= '\keephidden{ENDOFPROBLEM}\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}'; - if (not $ENV{'request.symb'} =~ m/\.page_/) { - $result .= $endminipage.'\end{document} '; + if ($ENV{'form.print_discussions'} eq 'yes') { + $result.=&Apache::lonxml::xmlend($target,$parser); + $result=~s/<\/html>//; } else { - $result .= ''; + $result .= '\keephidden{ENDOFPROBLEM}\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}'; + if (not $ENV{'request.symb'} =~ m/\.page_/) { + $result .= $endminipage.'\end{document} '; + } else { + $result .= ''; + } } } } @@ -670,6 +703,7 @@ sub end_problem { $result=&Apache::response::mandatory_part_meta; } $result.=&Apache::response::meta_part_order(); + $result.=&Apache::response::meta_response_order(); } elsif ($target eq 'edit') { &Apache::lonxml::debug("in end_problem with $target, edit"); $result = &problem_edit_footer(); @@ -858,7 +892,7 @@ sub start_instructorcomment { if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex' || $target eq 'analyze') { $result=($ENV{'request.role'}=~/^(in|cc|au|ca|li)/); - if ( ! $result ) { + if ( (! $result) or ($ENV{'form.instructor_comments'} eq 'hide')) { my $skip=&Apache::lonxml::get_all_text("/instructorcomment", $parser,$style); &Apache::lonxml::debug("skipping ahead :$skip: $$parser[-1]"); @@ -928,13 +962,13 @@ sub end_while { while ($return) { if (time-$starttime > $Apache::lonnet::perlvar{'lonScriptTimeout'}) { - $return = 0; $error=1; next; + #$return = 0; $error=1; next; } $result.=&Apache::scripttag::xmlparse($bodytext); $return = &Apache::run::run($code,$safeeval); } if ($error) { - &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.'
'); + &Apache::lonxml::error('
'.&mt('Code ran too long. It ran for more than').' '.$Apache::lonnet::perlvar{'lonScriptTimeout'}.' '.&mt('seconds occured while running <while> on line').' '.$line.'
'); } } elsif ($target eq "edit") { $result.= &Apache::edit::tag_end($target,$token,''); @@ -1038,7 +1072,11 @@ sub start_part { @Apache::inputtags::previous_version=(); $Apache::lonhomework::problemstatus=&get_problem_status($id); my $hidden=&Apache::loncommon::check_if_partid_hidden($Apache::inputtags::part); + my $newtype=&Apache::lonnet::EXT("resource.$id.type"); + if ($newtype) { $Apache::lonhomework::type=$newtype; } + my $expression='$external::part=\''.$Apache::inputtags::part.'\';'; + $expression.='$external::type=\''.$Apache::lonhomework::type.'\';'; &Apache::run::run($expression,$safeeval); if ($target eq 'meta') { @@ -1077,7 +1115,11 @@ sub start_part { } else { if ($target eq 'tex') { if (not $ENV{'form.problem_split'}=~/yes/) { - $result.='\noindent \end{minipage}\vskip 0 mm \noindent \begin{minipage}{\textwidth}\noindent'; + if ($$tagstack[-2] eq 'td') { + $result.='\vskip 0 mm \noindent \begin{minipage}{\textwidth}\noindent'; + } else { + $result.='\noindent \end{minipage}\vskip 0 mm \noindent \begin{minipage}{\textwidth}\noindent'; + } } my $weight = &Apache::lonnet::EXT("resource.$id.weight"); my $allkeys=&Apache::lonnet::metadata($ENV{'request.uri'},'packages'); @@ -1088,6 +1130,10 @@ sub start_part { if ($1 ne '0') {$allow_print_points=1;} } } + my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries"); + if (defined($maxtries) && $maxtries < 0) { + $allow_print_points=0; + } if (($Apache::lonhomework::type eq 'exam') && ($allow_print_points)) { $result .= '\fbox{\textit{'.$weight.' pt}}';} } elsif ($target eq 'web') { $result.=''; @@ -1137,6 +1183,7 @@ sub end_part { $gradestatus=''; } $result=$gradestatus; + if ($$tagstack[-2] eq 'td' and $target eq 'tex') {$result.='\end{minipage}';} } elsif ($target eq 'edit') { $result=&Apache::edit::end_table(); } @@ -1324,12 +1371,14 @@ sub delete_startouttext { sub start_simpleeditbutton { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result=''; - if (($target eq 'web') && + if (($ENV{'form.simple_edit_button'} ne 'off') && + ($target eq 'web') && (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) { my $url=$ENV{'request.noversionuri'}; $url=~s/\?.*$//; + my ($symb) = &Apache::lonxml::whichuser(); $result='
'. - ''.&mt('Simple Problem Editor').' - '.&mt('Note: it can take up to 10 minutes for changes to take effect for all users.'). + ''.&mt('Edit').' - '.&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;