--- loncom/interface/lonprintout.pm 2003/02/17 16:43:54 1.117
+++ loncom/interface/lonprintout.pm 2003/02/27 19:41:40 1.121
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Printout
#
-# $Id: lonprintout.pm,v 1.117 2003/02/17 16:43:54 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.121 2003/02/27 19:41:40 bowersj2 Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -202,7 +202,7 @@ sub sequence_content_menu {
}
}
-DDD=$#titles_master_seq $titles_master_seq[0]
+
@@ -238,6 +238,7 @@ sub problem_choice_menu {
$subdirtoprint =~ s/\/[^\/]+$//;
my @list_of_files = ();
my @content_directory = ();
+ $r->print("Subdir: " . $subdirtoprint . " ");
if ($subdirtoprint =~ m|/home/([^/]+)/public_html|) {
#localmachine CSTR space
my $user=$1;
@@ -612,7 +613,7 @@ ENDPART
foreach my $person (@students) {
my $current_output = '';
my ($usersection,$username,$userdomain) = split /:/,$person;
- my $fullname = &Apache::grades::get_fullname($username,$userdomain);
+ my $fullname = &Apache::grades::get_fullname($username,$userdomain);
#goes through all resources, checks if they are available for current student, and produces output
foreach my $curresline (@master_seq) {
my ($curres,$symb) = split /&&/, $curresline;
@@ -637,10 +638,11 @@ ENDPART
} else {
my $blanspages = '';
for (my $j=0;$j<$ENV{'form.addedpages'};$j++) {$blanspages.='\clearpage\strut\clearpage';}
- $current_output = '\strut\\newline\\noindent\\makebox[\\textwidth/$number_of_columns][b]{\\hrulefill}\\newline\\noindent{\\tiny Printed from LON-CAPA\\copyright MSU{\\hfill} Licensed under GNU General Public License } \\vskip 3mm'.$blanspages.'\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent\\lhead{\\textit{\\textbf{'.$fullname.'}} - '.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$assignment.'}}\hskip 1.4in } \vskip 5 mm '.$current_output;
+ $current_output = '\strut\\newline\\noindent\\makebox[\\textwidth/$number_of_columns][b]{\\hrulefill}\\newline\\noindent{\\tiny Printed from LON-CAPA\\copyright MSU{\\hfill} Licensed under GNU General Public License }\\newpage \\vskip 3mm'.$blanspages.'\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent\\lhead{\\textit{\\textbf{'.$fullname.'}} - '.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$assignment.'}}\hskip 1.4in } \vskip 5 mm '.$current_output;
}
$result .= $current_output;
- &Apache::lonnet::delenv('form.counter');
+ &Apache::lonnet::delenv('form.counter');
+ &Apache::lonxml::init_counter();
}
$result .= '\end{document}';
&Apache::lonnet::delenv('form.textwidth');
@@ -1215,11 +1217,8 @@ sub handler {
my $r = shift;
- # not sure where the form.* was getting processed.
- Apache::loncommon::get_unprocessed_cgi($ENV{QUERY_STRING});
-
# A hook for me to work without disturbing Alex.
- if ($ENV{'form.jeremy'}) {
+ if (!$ENV{'form.jeremy'}) {
printWizard($r);
return OK;
}
@@ -1309,29 +1308,66 @@ sub printWizard {
my ($resourceTitle,$sequenceTitle,$mapTitle) = &details_for_menu;
- my $wizard = Apache::lonwizard->new("Printing Wizard");
+ my $wizard = Apache::lonwizard->new("Printing Wizard", $ENV{QUERY_STRING});
# PRINT_TYPE: What the user wants to print (current docs,
# whole sequence, etc.
- $wizard->declareVars(['PRINT_TYPE']);
+ $wizard->declareVars(['PRINT_TYPE', 'FORMAT', 'postdata', 'url',
+ 'symb', 'RESOURCES', 'FILES', 'STUDENTS']);
+
+ # Extract map
+ my $symb = $wizard->{VARS}->{'symb'};
+ my ($map, $id, $url) = split(/__/, $symb);
+
+ my $subdir = &Apache::lonnet::filelocation("", $ENV{'form.url'});
+
+ # "Delete everything after the last slash."
+ $subdir =~ s|/[^/]+$||;
+
+ # This really ought to be in some repository in loncommon or
+ # something where it can just be grabbed.
+ my $problemFilter = sub {
+ my $name = shift;
+ return $name =~ m/^[^\.]+\.(problem|exam|quiz|assess|survey|form|library)$/;
+ };
+
+ # What can be printed is a very dynamic decision based on
+ # lots of factors. So we need to dynamically build this list.
+ # To prevent security leaks, states are only added to the wizard
+ # if they can be reached, which ensures manipulating the querystring
+ # won't allow anyone to reach states they shouldn't have permission
+ # to reach.
+ my $printChoices = [];
+ # We can always print the current screen.
+ push @{$printChoices}, ['current_document', "$resourceTitle (exactly what was on the screen)", 'CHOOSE_FORMAT'];
+
+ if ($ENV{'form.postdata'}=~ /\/res\//) {
+ # Allow problems from sequence
+ push @{$printChoices}, ['map_problems', "Problems from $sequenceTitle", 'CHOOSE_PROBLEMS'];
+ Apache::lonwizard::resource_multichoice->new($wizard, "CHOOSE_PROBLEMS", 'Select Problems', "Select problems to print from $sequenceTitle:", '', 'CHOOSE_FORMAT', 'RESOURCES', sub {my $res = shift; return $res->is_problem()}, undef, $map);
+
+ # Allow all resources from sequence
+ push @{$printChoices}, ['map_problems_pages', "Problems and pages from $sequenceTitle", 'CHOOSE_PROBLEMS_HTML'];
+ Apache::lonwizard::resource_multichoice->new($wizard, "CHOOSE_PROBLEMS_HTML", 'Select Resources', "Select resources to print from $sequenceTitle:", '', "CHOOSE_FORMAT", 'RESOURCES', sub {my $res = shift; return !$res->is_map()}, undef, $map);
+ }
+
+ # If the user is priviledged, allow them to print all
+ # problems in the course, optionally for selected students
+ if (($ENV{'request.role'}=~m/^cc\./ or $ENV{'request.role'}=~m/^in\./ or $ENV{'request.role'}=~m/^ta\./) and ($ENV{'form.postdata'}=~/\/res\//)) {
+ push @{$printChoices}, ['all_problems', 'All problems in course (may take a lot of time)', 'CHOOSE_FORMAT'];
+ push @{$printChoices}, ['problems_for_students', "Problems from $sequenceTitle for selected students", 'CHOOSE_STUDENTS'];
+ Apache::lonwizard::choose_student->new($wizard, "CHOOSE_STUDENTS", "Choose Students", "Select the students you wish to print the problems for:", '', 'CHOOSE_FORMAT', 'STUDENTS', 1);
+ }
+
+ # FIXME: That RE should come from a library somewhere.
+ if ((&Apache::lonnet::allowed('bre',$subdir) eq 'F') and ($ENV{'form.postdata'}=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)/)) {
+ push @{$printChoices}, ['problems_from_directory', "Problems from $subdir", 'CHOOSE_FROM_SUBDIR'];
+ Apache::lonwizard::choose_files->new($wizard, "CHOOSE_FROM_SUBDIR", "Select Files","Select problems you wish to print from $subdir:", '', 'CHOOSE_FORMAT', 'FILES', $subdir, $problemFilter);
+ }
+
+ # Despite the appearance of states before here, this is the first state.
+ Apache::lonwizard::switch_state->new($wizard, "START", "Selecting Resources to Print", "PRINT_TYPE", $printChoices, "What do you want to print?");
+ Apache::lonprintout::page_format_state->new($wizard, "CHOOSE_FORMAT", "Page Format", "FORMAT");
- my $subdir = $ENV{'form.postdata'};
- $subdir =~ s|http://[^/]+||;
- $subdir =~ m/\/([^\/]+)$/;
- $subdir =~ s/\Q$1\E//;
-
- # This code also shows up above... which is prefered? Is one
- # right for this context?
- #my $subdir = &Apache::lonnet::filelocation("",$ENV{'form.url'});
- #$subdir =~ s/\/[^\/]+$//;
-
- Apache::lonwizard::switch_state->new($wizard, "START", "Selecting Resources to Print", "PRINT_TYPE", [
- ['current_document', "$resourceTitle (exactly what was on the screen)", 'CHOOSE_FORMAT'],
- ['map_problems', "Problems from $sequenceTitle", 'CHOOSE_FORMAT'],
- ['map_problems_pages', "All of $sequenceTitle", 'CHOOSE_FORMAT'],
- ['problems_for_students', "Problems from $sequenceTitle for selected students", 'CHOOSE_FORMAT'],
- ['problems_from_directory', "Problems from $subdir", 'CHOOSE_FORMAT'] ],
- "What do you want to print?");
-
$r->print($wizard->display());
untie %hash;
@@ -1342,5 +1378,122 @@ sub printWizard {
1;
+
+package Apache::lonprintout::page_format_state;
+
+=pod
+
+=head1 Wizard state: page_format_state
+
+See lonwizard.pm documentation for discussion of the wizard framework.
+
+Apache::lonprintout::page_format_state is a state that gives the user an opportunity to select the page layout they wish to print with: Number of columns, portrait/landscape, and paper size. If you want to change the paper size choices, change the @paperSize array contents in this package.
+
+=over 4
+
+=item * B(parentLonWizReference, stateName, stateTitle, varName, nextState): varName is where the print information will be stored in the format FIXME. nextState is the state that follows this one.
+
+=back
+
+=cut
+
+use Apache::lonwizard;
+
+no strict;
+@ISA = ("Apache::lonwizard::state");
+use strict;
+
+my $maxColumns = 2;
+my @paperSize = ("Letter [8 1/2x11 in]", "Legal [8 1/2x14 in]",
+ "Ledger/Tabloid [11x17 in]", "Executive [7 1/2x10 in]",
+ "A2 [420x594 mm]", "A3 [297x420 mm]", "A4 [210x297 mm]",
+ "A5 [148x210 mm]", "A6 [105x148 mm]" );
+
+# Tentative format: Orientation (L = Landscape, P = portrait) | Colnum |
+# Paper type
+
+sub new {
+ my $proto = shift;
+ my $class = ref($proto) || $proto;
+ my $self = bless $proto->SUPER::new(shift, shift, shift);
+
+ $self->{VAR_NAME} = shift;
+ $self->{NEXT_STATE} = shift;
+ return $self;
+}
+
+sub postprocess {
+ my $self = shift;
+ my $wizard = $self->{WIZARD};
+
+ # We have to manually collect the value and store it in the
+ # wizard variable
+ my $result = $ENV{'form.' . $self->{VAR_NAME} . '.layout'} . '|';
+ $result .= $ENV{'form.' . $self->{VAR_NAME} . '.cols'} . '|';
+ $result .= $ENV{'form.' . $self->{VAR_NAME} . '.paper'};
+
+ $wizard->setVar($self->{VAR_NAME}, $result);
+ $wizard->changeState($self->{NEXT_STATE});
+}
+
+sub render {
+ my $self = shift;
+ my $wizard = $self->{WIZARD};
+ my $result = '';
+ my $var = $self->{VAR_NAME};
+ my $curVal = $self->{WIZARD}->{VARS}->{$var};
+
+ my ($layout, $cols, $paper) = split(/\|/, $curVal);
+
+ my $landscapeChecked = ($layout ne "L")? '' : 'checked ';
+ my $portraitChecked = $landscapeChecked ? '' : 'checked ';
+
+ $result .= <How should the printing be formatted?
+