--- loncom/interface/lonprintout.pm 2003/06/18 18:11:16 1.188 +++ loncom/interface/lonprintout.pm 2003/06/24 14:07:27 1.194 @@ -1,7 +1,7 @@ # The LearningOnline Network # Printout # -# $Id: lonprintout.pm,v 1.188 2003/06/18 18:11:16 bowersj2 Exp $ +# $Id: lonprintout.pm,v 1.194 2003/06/24 14:07:27 sakharuk Exp $ # # Copyright Michigan State University Board of Trustees # @@ -328,13 +328,13 @@ sub page_format { if ($papersize eq '0') { if ($layout eq 'book') { if ($numberofcolumns == 1) { - $textwidth = '18 cm'; - $textheight = '25.9 cm'; + $textwidth = '7.1 in'; #'18 cm'; + $textheight = '10.2 in'; #'25.9 cm'; $oddoffset = '-0.57 in'; $evenoffset = '-0.57 in'; } elsif ($numberofcolumns == 2) { - $textwidth = '93 mm'; - $textheight = '25.9 cm'; + $textwidth = '3.66 in'; #'93 mm'; + $textheight = '10.2 in'; #'25.9 cm'; $oddoffset = '-0.57 in'; $evenoffset = '-0.57 in'; } @@ -419,10 +419,9 @@ sub page_format_transformation { $text =~ s/\\begin{document}/\\setlength{\\oddsidemargin}{$oddoffset}\\setlength{\\evensidemargin}{$evenoffset}\\setlength{\\topmargin}{200pt}\\setlength{\\textwidth}{$textwidth}\\setlength{\\textheight}{$textheight}\\setlength{\\parindent}{20pt}\\setlength{\\marginparwidth}{90pt}\\setlength{\\textfloatsep}{8pt plus 2\.0pt minus 4\.0pt}\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm} \\begin{document}\\setcounter{page}{1}\\noindent\\parbox{\\minipagewidth}{\\noindent\\fbox{\\textbf{$name}} \\hfill $courseidinfo} \\vskip 5 mm /; } elsif ($layout eq 'book') { if ($choice ne 'All class print') { - $text =~ s/\\begin{document}/\\textheight $textheight\\oddsidemargin = $evenoffset\\evensidemargin = $evenoffset\\textwidth= $textwidth\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\usepackage{fancyhdr}\\pagestyle{fancy}\\rhead{}\\chead{}\\lhead{\\textbf{$name} - $courseidinfo \\hfill \\thepage \\\\ \\textit{$assignment}}\\begin{document}\\voffset=-0\.8 cm\\setcounter{page}{1}/; + $text =~ s/\\begin{document}/\\textheight $textheight\\oddsidemargin = $evenoffset\\evensidemargin = $evenoffset\\textwidth= $textwidth\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\usepackage{fancyhdr}\\pagestyle{fancy}\\rhead{}\\chead{}\\lhead{\\textbf{$name} - $courseidinfo \\hfill \\thepage \\\\ \\textit{$assignment}}\\begin{document}\\voffset=-0\.8 cm\\setcounter{page}{1}/; } else { - $text =~ s/\\pagestyle{fancy}\\rhead{}\\chead{}\s*\\begin{document}/\\textheight $textheight\\oddsidemargin = $evenoffset\\evensidemargin = $evenoffset\\textwidth= $textwidth\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\pagestyle{fancy}\\rhead{}\\chead{}\\begin{document}\\voffset=-0\.8cm\\setcounter{page}{1} \\vskip 5 mm /; - + $text =~ s/\\pagestyle{fancy}\\rhead{}\\chead{}\s*\\begin{document}/\\textheight = $textheight\\oddsidemargin = $evenoffset\\evensidemargin = $evenoffset\\textwidth= $textwidth\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\pagestyle{fancy}\\rhead{}\\chead{}\\begin{document}\\voffset=-0\.8cm\\setcounter{page}{1} \\vskip 5 mm /; } } return $text; @@ -525,11 +524,11 @@ ENDPART my ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format($papersize,$laystyle,$numberofcolumns); my $assignment = $ENV{'form.assignment'}; my $LaTeXwidth; - if ($textwidth=~/(\d+)\s*cm/) { + if ($textwidth=~/(\d+\.?\d*)\s*cm/) { $LaTeXwidth = $1*10; - } elsif ($textwidth=~/(\d+)\s*mm/) { + } elsif ($textwidth=~/(\d+\.?\d*)\s*mm/) { $LaTeXwidth = $1; - } elsif ($textwidth=~/(\d+)\s*in/) { + } elsif ($textwidth=~/(\d+\.?\d*)\s*in/) { $LaTeXwidth = $1*25.4; } $LaTeXwidth.=' mm'; @@ -584,9 +583,14 @@ ENDPART ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_pages') or ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems')) { #-- produce an output string + my %form=(); + $form{'grade_target'}='tex'; + $form{'textwidth'}=$LaTeXwidth; + $form{'problem_split'}=$parmhash{'problem_stream_switch'}; my $flag_latex_header_remove = 'NO'; my $flag_page_in_sequence = 'NO'; my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'}; + my $prevassignment=''; for (my $i=0;$i<=$#master_seq;$i++) { $master_seq[$i]=~/___\d+___(.*)$/; my $urlp='/res/'.$1; @@ -597,11 +601,9 @@ ENDPART } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems') { $selectionmade = 4; } - my %form; - $form{'grade_target'}='tex'; - $form{'textwidth'}=$LaTeXwidth; $form{'symb'}=$master_seq[$i]; - $form{'problem_split'}=$parmhash{'problem_stream_switch'}; + $master_seq[$i]=~/\/([^\/]+)\.sequence_/; + my $assignment=' '.$1.' '; #&Apache::lonnet::logthis("Trying to get $urlp with symb $master_seq[$i]"); my $texversion=&Apache::lonnet::ssi($urlp,%form); if ($urlp=~/\.page$/) { @@ -622,7 +624,18 @@ ENDPART my $answer=&Apache::lonnet::ssi($urlp,%form); $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/; } - $result .= $texversion; +# $result .= $texversion; + if (($selectionmade == 4) and ($assignment ne $prevassignment) and ($i>1)) { + my $name = &get_name(); + if ($name =~ /^\s*$/) { + $name=&Apache::lonxml::latex_special_symbols($ENV{'user.name'},undef, + undef,'header'); + } + my $courseidinfo = &Apache::lonxml::latex_special_symbols(&Apache::lonnet::unescape($ENV{'course.'.$ENV{'request.course.id'}.'.description'}),'','','header'); + $prevassignment=$assignment; + $result .='\newpage \noindent\parbox{\minipagewidth}{\noindent\\lhead{\\textit{\\textbf{'.$name.'}} - '.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$assignment.'}}} \vskip -5 mm '; + } + $result .= $texversion; $flag_latex_header_remove = 'YES'; } &Apache::lonnet::delenv('form.counter'); @@ -659,8 +672,7 @@ ENDPART if($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') { my %form; $form{'answer_output_mode'}='tex'; - my $ansrendered = &Apache::loncommon::get_student_answers($curresline,$username,$userdomain, - $ENV{'request.course.id'},%form); + my $ansrendered = &Apache::loncommon::get_student_answers($curresline,$username,$userdomain,$ENV{'request.course.id'},%form); $rendered=~s/(\\keephidden{ENDOFPROBLEM})/$ansrendered$1/; } $current_output .= $rendered; @@ -748,8 +760,8 @@ ENDPART #-------------------------------------------------------- corrections for the different page formats $result = &page_format_transformation($papersize,$laystyle,$numberofcolumns,$helper->{'VARS'}->{'PRINT_TYPE'},$result,$helper->{VARS}->{'assignment'}); $result = &latex_corrections($number_of_columns,$result); -# #changes page's parameters for the one column output -# if ($ENV{'form.numberofcolumns'} == 1) { + #changes page's parameters for the one column output +# if ($numberofcolumns == 1) { # $result =~ s/\\textwidth= 9cm/\\textwidth= $ENV{'form.width'}/; # $result =~ s/\\textheight 25\.9cm/\\textheight $ENV{'form.height'}/; # $result =~ s/\\evensidemargin = -0\.57in/\\evensidemargin= $ENV{'form.leftmargin'}/; @@ -799,12 +811,6 @@ sub handler { # return OK; my %parmhash=&Apache::lonnet::coursedescription($ENV{'request.course.id'}); -# $r->print('
START '.$ENV{'request.course.fn'}.' FINISH
'); -# my $key; -# foreach $key (keys %parmhash) { -# $r->print(' '.$key.'->'.$parmhash{$key}.'<-
'); -# } -# return OK; &output_data($r,$helper,\%parmhash); @@ -906,6 +912,8 @@ sub printHelper { $subdir = &Apache::lonnet::filelocation("", $url); } + my $userCanSeeHidden = Apache::lonnavmaps::advancedUser(); + Apache::lonhelper::registerHelperTags(); # "Delete everything after the last slash." @@ -913,6 +921,8 @@ sub printHelper { if (not $helper->{VARS}->{'construction'}) { $subdir='/home/httpd/html/res/'.$subdir; } + # "Remove all duplicate slashes." + $subdir =~ s|/+|/|g; # What can be printed is a very dynamic decision based on # lots of factors. So we need to dynamically build this list. @@ -941,18 +951,20 @@ sub printHelper { # Allow all resources from sequence push @{$printChoices}, ["Everything (problem(s), page(s), html/xml file(s)) from $sequenceTitle", 'map_problems_pages', 'CHOOSE_PROBLEMS_HTML']; - my $isProblem = '$res->is_problem();'; + my $isProblem = '$res->is_problem()'; + $isProblem .= ' && !$res->randomout()' if !$userCanSeeHidden; my $isProblemOrMap = '$res->is_problem() || $res->is_map()'; - my $isNotMap = '!$res->is_map();'; - my $symb = '$res->symb();'; + my $isNotMap = '!$res->is_map()'; + $isNotMap .= ' && !$res->randomout()' if !$userCanSeeHidden; + my $symb = '$res->symb()'; my $helperFragment = < (mark them then click "next" button)
PAGESIZE - return $isProblem + return $isProblem; $map - return $symb + return $symb; @@ -962,7 +974,7 @@ sub printHelper { PAGESIZE return $isNotMap; $map - return $symb + return $symb; HELPERFRAGMENT @@ -976,22 +988,23 @@ HELPERFRAGMENT push @{$printChoices}, ['Problems in this course', 'all_problems', 'ALL_PROBLEMS']; push @{$printChoices}, ["Problems from $sequenceTitle for selected students", 'problems_for_students', 'CHOOSE_STUDENTS']; - my $isProblem = '$res->is_problem();'; - my $isProblemOrMap = '$res->is_problem() || $res->is_map()'; - my $symb = '$res->symb();'; + my $isProblem = '$res->is_problem()'; + $isProblem .= ' && !$res->randomout()' if !$userCanSeeHidden; + my $isProblemOrMap = '($res->is_problem() || $res->is_map())'; + $isProblemOrMap .= ' && !$res->randomout()' if !$userCanSeeHidden; + my $symb = '$res->symb()'; &Apache::lonxml::xmlparse($r, 'helper', < (mark them then click "next" button)
PAGESIZE - return $isProblemOrMap - return $isProblem - return $symb + return $isProblemOrMap; + return $isProblem; + return $symb; - (do not forget to select assignment itself - make another selection below)

Select resources for the assignment
 @@ -1001,16 +1014,16 @@ HELPERFRAGMENT
How should the results be printed?
 - Start each student's assignment on a new page (add a pagefeed after each assignment) - Add one empty page after each student's assignment - Add two empty pages after each student's assignment + Start each student\'s assignment on a new page (add a pagefeed after each assignment) + Add one empty page after each student\'s assignment + Add two empty pages after each student\'s assignment CHOOSE_STUDENTS } # FIXME: That RE should come from a library somewhere. - if (((&Apache::lonnet::allowed('bre',$subdir) eq 'F') and ($helper->{VARS}->{'postdata'}=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)/)) or defined $helper->{'VARS'}->{'construction'}) { + if ((((&Apache::lonnet::allowed('bre',$subdir) eq 'F') and ($helper->{VARS}->{'postdata'}=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)/)) or defined $helper->{'VARS'}->{'construction'}) and $ENV{'request.role.adv'}) { push @{$printChoices}, ["Problems from current subdirectory $subdir", 'problems_from_directory', 'CHOOSE_FROM_SUBDIR']; my $f = '$filename';