--- loncom/homework/structuretags.pm 2002/09/16 20:40:38 1.114 +++ loncom/homework/structuretags.pm 2002/09/30 15:10:11 1.119 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: structuretags.pm,v 1.114 2002/09/16 20:40:38 albertel Exp $ +# $Id: structuretags.pm,v 1.119 2002/09/30 15:10:11 sakharuk Exp $ # # Copyright Michigan State University Board of Trustees # @@ -161,7 +161,7 @@ sub problem_web_to_edit_header {  Show All Foils
'; } @@ -297,7 +297,9 @@ sub start_problem { $msg.=&checkout_msg; } $result.=$msg.'
'; - } + } elsif ($target eq 'tex') { + $result.="\\begin{document}\\noindent \\vskip 1 mm \\begin{minipage}{\\textwidth}\\vskip 0 mm Problem is not open to be viewed. It $accessmsg \\vskip 0 mm "; + } } elsif ($target eq 'web') { my $name= &get_resource_name($parstack,$safeeval); if ($status eq 'CAN_ANSWER') { @@ -345,18 +347,18 @@ sub start_problem { 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'; + $result .= '\begin{document} \noindent\textit{Due date: '.$duedate.'} \vskip 1 mm\noindent \begin{minipage}{\textwidth}'; } else { - $result .= '\begin{document} \noindent \vskip 1 mm'; + $result .= '\begin{document} \noindent \vskip 1 mm \begin{minipage}{\textwidth}'; } } else { - $result .= '\parbox{\minipagewidth}{\vskip 1mm\textit{Due date: '.$duedate.'} \\\\\\\\'; + $result .= '\vskip 1mm\textit{Due date: '.$duedate.'} \\\\\\\\'; } } else { if (not $ENV{'request.symb'} =~ m/\.page_/) { - $result .= '\begin{document} \noindent \vskip 1 mm'; + $result .= '\begin{document} \noindent \vskip 1 mm\noindent\begin{minipage}{\textwidth}'; } else { - $result .= '\parbox{\minipagewidth}{\vskip 1mm \\\\\\\\'; + $result .= '\vskip 1mm \\\\\\\\'; } } } @@ -390,7 +392,7 @@ sub end_problem { my $gradestatus = &Apache::inputtags::gradestatus($Apache::inputtags::part); #FIXME this is ugly we should just generate tex in inputtags if ($target eq 'tex') { $gradestatus=&html_to_tex($gradestatus); } - $result.= $gradestatus; + if ($Apache::lonhomework::type ne 'exam') {$result.= $gradestatus;} } if ( (($target eq 'web') && ($ENV{'request.state'} ne 'construct')) || @@ -411,9 +413,9 @@ sub end_problem { } else { $result .= '\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}'; if (not $ENV{'request.symb'} =~ m/\.page_/) { - $result .= '\end{document} '; + $result .= '\end{minipage}\end{document} '; } else { - $result .= '} '; + $result .= ''; } } } @@ -601,7 +603,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]; } @@ -750,7 +752,7 @@ sub end_startouttext { ". &Apache::edit::insertlist($target,$token). &Apache::edit::end_row().&Apache::edit::start_spanning_row()."\n". - &Apache::edit::editfield($token->[1],$text,"",50,4); + &Apache::edit::editfield($token->[1],$text,"",80,4); } if ($target eq 'modified') { $text=&Apache::lonxml::get_all_text("endouttext",$$parser['-1']);