--- loncom/homework/structuretags.pm 2004/02/16 20:30:34 1.242 +++ loncom/homework/structuretags.pm 2004/11/30 23:28:57 1.273 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: structuretags.pm,v 1.242 2004/02/16 20:30:34 albertel Exp $ +# $Id: structuretags.pm,v 1.273 2004/11/30 23:28:57 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -25,9 +25,7 @@ # # 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; @@ -38,10 +36,9 @@ 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','startouttext','endouttext', -'simpleeditbutton','definetag')); + &Apache::lonxml::register('Apache::structuretags',('block','languageblock','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','problemtype','startouttext','endouttext','simpleeditbutton','definetag')); } sub start_web { @@ -85,12 +82,18 @@ sub page_start { if (!defined($found{'html'})) { $result=&Apache::londefdef::start_html($target,$token,$tagstack, $parstack,$parser,$safeeval); - $head_tag_start=''.&Apache::lonmenu::registerurl(undef,$target); + $head_tag_start=''.&Apache::lonmenu::registerurl(undef,$target). + &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); } @@ -152,7 +158,8 @@ sub setup_rndseed { my ($safeeval)=@_; my $rndseed; my ($symb)=&Apache::lonxml::whichuser(); - if ($ENV{'request.state'} eq "construct" || $symb eq '') { + if ($ENV{'request.state'} eq "construct" || $symb eq '' || + $Apache::lonhomework::history{'resource.CODE'}) { $rndseed=$ENV{'form.rndseed'}; if (!$rndseed) { $rndseed=$Apache::lonhomework::history{'rndseed'}; @@ -172,32 +179,43 @@ sub setup_rndseed { if (defined($rndseed) && $rndseed ne int($rndseed)) { $rndseed=join(',',&Math::Random::random_seed_from_phrase($rndseed)); } + if ($Apache::lonhomework::history{'resource.CODE'}) { + $rndseed=&Apache::lonnet::rndseed(); + } if ($safeeval) { &Apache::lonxml::debug("Setting rndseed to $rndseed"); - &Apache::run::run('$external::randomseed='.$rndseed.';',$safeeval); + &Apache::run::run('$external::randomseed="'.$rndseed.'";',$safeeval); } } 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') + .'
'. '
'; } sub problem_edit_footer { return '

- '; + '. + &Apache::lonhtmlcommon::htmlareaselectactive(@Apache::lonxml::htmlareafields). + "\n
\n\n"; } sub option { @@ -213,14 +231,14 @@ sub option { sub problem_web_to_edit_header { my ($rndseed)=@_; my $result.=' - - - - + + + + - + 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")." @@ -323,25 +341,40 @@ sub checkout_msg {

$lt{'warning'}

 -
+
ENDCHECKOUT } +sub firstaccess_msg { + my ($time,$symb)=@_; + my ($map)=&Apache::lonnet::decode_symb($symb); + my $foldertitle=&Apache::lonnet::gettitle($map); + &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". +
+ + +
+ENDCHECKOUT +} + sub init_problem_globals { my ($type)=@_; #initialize 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 = (); @@ -377,12 +410,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; } @@ -404,8 +439,8 @@ sub start_problem { $Apache::lonhomework::scantronmode=1; } + &initialize_storage(); if ($target ne 'analyze') { - &initialize_storage(); if ($target eq 'web') { &Apache::lonhomework::showhash(%Apache::lonhomework::history); } @@ -430,6 +465,7 @@ sub start_problem { #added vars to the scripting enviroment my $expression='$external::part=\''.$Apache::inputtags::part.'\';'; + $expression.='$external::type=\''.$Apache::lonhomework::type.'\';'; &Apache::run::run($expression,$safeeval); my $status; my $accessmsg; @@ -453,7 +489,9 @@ sub start_problem { } $body_tag_start.=&Apache::lonxml::printtokenheader($target,$token); } - + if ($ENV{'form.markaccess'}) { + &Apache::lonnet::set_first_access('map'); + } #handle rand seed in construction space my $rndseed=&setup_rndseed($safeeval); my ($symb)=&Apache::lonxml::whichuser(); @@ -463,7 +501,16 @@ sub start_problem { ''. '
'; + value="'.$ENV{'form.username'}.'" />'; + if ($ENV{'user.adv'}) { + $form_tag_start.= + ' '; my $msg=$body_tag_start; if ($status eq 'UNAVAILABLE') { - $result.='

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

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

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

'; + $msg.='

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

'; + } elsif ($status ne 'NOT_YET_VIEWED') { + $msg.='

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

'; } if ($status eq 'CLOSED' || $status eq 'INVALID_ACCESS') { $msg.='The problem '.$accessmsg; } elsif ($status eq 'UNCHECKEDOUT') { $msg.=&checkout_msg; + } elsif ($status eq 'NOT_YET_VIEWED') { + $msg.=&firstaccess_msg($accessmsg,$symb); } $result.=$msg.'
'; } elsif ($target eq 'tex') { @@ -542,7 +592,7 @@ sub start_problem { my @due_file_content = <$temp_file>; 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"; @@ -588,13 +638,17 @@ sub end_problem { my $status=$Apache::inputtags::status['-1']; 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' || $Apache::lonhomework::scantronmode)) { + if ( $target eq 'grade' && $Apache::inputtags::part eq '0') { # if part is zero, no s existed, so we need to the grading - &Apache::inputtags::grade; + if ($status eq 'CAN_ANSWER' ||$Apache::lonhomework::scantronmode) { + &Apache::inputtags::grade; + } else { + # move any submission data to .hidden + &Apache::inputtags::hidealldata($Apache::inputtags::part); + } } elsif ( ($target eq 'web' || $target eq 'tex') && $Apache::inputtags::part eq '0' && - $status ne 'UNCHECKEDOUT') { + $status ne 'UNCHECKEDOUT' && $status ne 'NOT_YET_VIEWED') { # if part is zero, no s existed, so we need show the current # grading status my $gradestatus = &Apache::inputtags::gradestatus($Apache::inputtags::part,$target); @@ -606,7 +660,9 @@ sub end_problem { ) { if ($target ne 'tex' && $ENV{'form.answer_output_mode'} ne 'tex') { - $result.="\n"; + $result.=""; + $result.=&Apache::lonhtmlcommon::htmlareaselectactive(@Apache::lonxml::htmlareafields); + $result.="\n"; } if ($target eq 'web') { $result.=&Apache::lonxml::xmlend(); @@ -615,11 +671,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 .= ''; + } } } } @@ -638,6 +699,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(); @@ -656,7 +718,10 @@ sub end_problem { sub start_library { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my ($result,$head_tag_start,$body_tag_start,$form_tag_start); - if ($$tagstack[0] eq 'library') { &init_problem_globals('library') }; + if ($$tagstack[0] eq 'library') { + &init_problem_globals('library'); + $Apache::lonhomework::type='problem'; + } if ($target eq 'edit') { ($result,$head_tag_start,$body_tag_start,$form_tag_start)= &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval); @@ -823,7 +888,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]"); @@ -893,13 +958,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,''); @@ -971,12 +1036,13 @@ sub shuffle { my $a=shift; my $i; if (defined(@$a)) { - &Apache::response::setrandomnumber(); + &Apache::response::pushrandomnumber(); for($i=@$a;--$i;) { my $j=int(&Math::Random::random_uniform() * ($i+1)); next if $i == $j; @$a[$i,$j] = @$a[$j,$i]; } + &Apache::response::poprandomnumber(); } } @@ -1002,7 +1068,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') { @@ -1024,6 +1094,7 @@ sub start_part { } if (( $status eq 'CLOSED' ) || ( $status eq 'UNCHECKEDOUT') || + ( $status eq 'NOT_YET_VIEWED') || ( $status eq 'BANNED') || ( $status eq 'UNAVAILABLE') || ( $status eq 'INVALID_ACCESS')) { @@ -1040,7 +1111,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'); @@ -1085,10 +1160,14 @@ sub end_part { my $result=''; if ( $target eq 'meta' ) { $result=''; - } elsif ($target eq 'grade' && - ($status eq 'CAN_ANSWER' || $Apache::lonhomework::scantronmode) && - !$hidden) { - $result=&Apache::inputtags::grade; + } elsif ($target eq 'grade') { + if (($status eq 'CAN_ANSWER' || $Apache::lonhomework::scantronmode) && + !$hidden) { + $result=&Apache::inputtags::grade; + } else { + # move any submission data to .hidden + &Apache::inputtags::hidealldata($Apache::inputtags::part); + } } elsif (($target eq 'web' || $target eq 'tex') && !$hidden ) { my $gradestatus=&Apache::inputtags::gradestatus($Apache::inputtags::part, $target); @@ -1096,6 +1175,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(); } @@ -1173,6 +1253,48 @@ sub end_solved { return ''; } +sub start_problemtype { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my $result; + if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || + $target eq 'tex' || $target eq 'analyze') { + my $mode=lc(&Apache::lonxml::get_param('mode',$parstack,$safeeval)); + if (!defined($mode)) { $mode='show'; } + my $for=&Apache::lonxml::get_param('for',$parstack,$safeeval); + my $found=0; + foreach my $type (split(',',$for)) { + if ($Apache::lonhomework::type eq lc($type)) { $found=1; } + } + if ($mode eq 'show' && !$found) { + &Apache::lonxml::get_all_text("/problemtype",$parser); + } + if ($mode eq 'hide' && $found) { + &Apache::lonxml::get_all_text("/problemtype",$parser); + } + } elsif ($target eq 'edit') { + $result .=&Apache::edit::tag_start($target,$token); + $result.=&Apache::edit::select_arg('Mode:','mode', + [['show','Show'], + ['hide','Hide']] + ,$token); + $result .=&Apache::edit::checked_arg('When used as type(s):','for', + [ ['exam','Exam/Quiz Problem'], + ['survey','Survey'], + ['problem','Homework Problem'] ] + ,$token); + $result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); + } elsif ($target eq 'modified') { + my $constructtag=&Apache::edit::get_new_args($token,$parstack, + $safeeval,'mode','for'); + if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } + } + return $result; +} + +sub end_problemtype { + return ''; +} + sub start_startouttext { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my @result=(''.''); @@ -1196,7 +1318,7 @@ sub end_startouttext { &Apache::edit::end_row(). &Apache::edit::start_spanning_row()."\n" . &Apache::loncommon::helpLatexCheatsheet () . - &Apache::edit::editfield($token->[1],$text,"",80,4); + &Apache::edit::editfield($token->[1],$text,"",80,8,1); } if ($target eq 'modified') { $result=''.&Apache::edit::modifiedfield("endouttext",$parser); @@ -1241,12 +1363,13 @@ 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/\?.*$//; $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;