[LON-CAPA-cvs] cvs: loncom /interface lonprintout.pm
bowersj2
lon-capa-cvs@mail.lon-capa.org
Thu, 27 Feb 2003 19:41:41 -0000
bowersj2 Thu Feb 27 14:41:41 2003 EDT
Modified files:
/loncom/interface lonprintout.pm
Log:
First cut at a completed print wizard. Ready for Alex to take the
form data out of the wizard, and let me know if I missed anything.
Note: The student chooser stinks; I'm working on that as it also
applies to the parameter wizard.
Index: loncom/interface/lonprintout.pm
diff -u loncom/interface/lonprintout.pm:1.120 loncom/interface/lonprintout.pm:1.121
--- loncom/interface/lonprintout.pm:1.120 Tue Feb 25 11:45:25 2003
+++ loncom/interface/lonprintout.pm Thu Feb 27 14:41:40 2003
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Printout
#
-# $Id: lonprintout.pm,v 1.120 2003/02/25 16:45:25 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.121 2003/02/27 19:41:40 bowersj2 Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1218,7 +1218,7 @@
my $r = shift;
# A hook for me to work without disturbing Alex.
- if ($ENV{'form.jeremy'}) {
+ if (!$ENV{'form.jeremy'}) {
printWizard($r);
return OK;
}
@@ -1312,7 +1312,7 @@
# PRINT_TYPE: What the user wants to print (current docs,
# whole sequence, etc.
$wizard->declareVars(['PRINT_TYPE', 'FORMAT', 'postdata', 'url',
- 'symb', 'RESOURCES', 'FILES']);
+ 'symb', 'RESOURCES', 'FILES', 'STUDENTS']);
# Extract map
my $symb = $wizard->{VARS}->{'symb'};
@@ -1330,17 +1330,43 @@
return $name =~ m/^[^\.]+\.(problem|exam|quiz|assess|survey|form|library)$/;
};
- Apache::lonwizard::switch_state->new($wizard, "START", "Selecting Resources to Print", "PRINT_TYPE", [
- ['current_document', "<b>$resourceTitle</b> (exactly what was on the screen)", 'CHOOSE_FORMAT'],
- ['map_problems', "Problems from <b>$sequenceTitle</b>", 'CHOOSE_PROBLEMS'],
- ['map_problems_pages', "Problems and pages from <b>$sequenceTitle</b>", 'CHOOSE_PROBLEMS_HTML'],
- ['problems_for_students', "Problems from <b>$sequenceTitle</b> for selected students", 'CHOOSE_FORMAT'],
- ['problems_from_directory', "Problems from <b>$subdir</b>", 'CHOOSE_FROM_SUBDIR'] ],
- "What do you want to print?");
- Apache::lonwizard::resource_multichoice->new($wizard, "CHOOSE_PROBLEMS", 'Select Problems', "Select problems to print from <b>$sequenceTitle</b>:", '', 'CHOOSE_FORMAT', 'RESOURCES', sub {my $res = shift; return $res->is_problem()}, undef, $map);
- Apache::lonwizard::resource_multichoice->new($wizard, "CHOOSE_PROBLEMS_HTML", 'Select Resources', "Select resources to print from <b>$sequenceTitle</b>:", '', "CHOOSE_FORMAT", 'RESOURCES', sub {my $res = shift; return !$res->is_map()}, undef, $map);
- Apache::lonwizard::choose_files->new($wizard, "CHOOSE_FROM_SUBDIR", "Select Files","Select problems you wish to print from <b>$subdir</b>:", '', 'CHOOSE_FORMAT', 'FILES', $subdir, $problemFilter);
- Apache::lonprintout::page_format_state->new($wizard, "CHOOSE_FORMAT", "Page Format", "FORMAT", "FINAL");
+ # 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', "<b>$resourceTitle</b> (exactly what was on the screen)", 'CHOOSE_FORMAT'];
+
+ if ($ENV{'form.postdata'}=~ /\/res\//) {
+ # Allow problems from sequence
+ push @{$printChoices}, ['map_problems', "Problems from <b>$sequenceTitle</b>", 'CHOOSE_PROBLEMS'];
+ Apache::lonwizard::resource_multichoice->new($wizard, "CHOOSE_PROBLEMS", 'Select Problems', "Select problems to print from <b>$sequenceTitle</b>:", '', '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 <b>$sequenceTitle</b>", 'CHOOSE_PROBLEMS_HTML'];
+ Apache::lonwizard::resource_multichoice->new($wizard, "CHOOSE_PROBLEMS_HTML", 'Select Resources', "Select resources to print from <b>$sequenceTitle</b>:", '', "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', '<b>All problems</b> in course (may take a lot of time)', 'CHOOSE_FORMAT'];
+ push @{$printChoices}, ['problems_for_students', "Problems from <b>$sequenceTitle</b> 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 <b>$subdir</b>", 'CHOOSE_FROM_SUBDIR'];
+ Apache::lonwizard::choose_files->new($wizard, "CHOOSE_FROM_SUBDIR", "Select Files","Select problems you wish to print from <b>$subdir</b>:", '', '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");
$r->print($wizard->display());
@@ -1463,39 +1489,8 @@
}
$result .= "</select></td></tr></table>";
+ $result .= '<input type="hidden" name="printWizDone" value="1" />';
return $result;
-}
-
-1;
-
-package Apache::lonprintout::printwizfinal;
-
-# This is the final state for the print wizard. It is not generally useful,
-# so it is not perldoc'ed.
-
-no strict;
-@ISA = ('Apache::lonwizard::state');
-use strict;
-
-sub new {
- my $proto = shift;
- my $class = ref($proto) || $proto;
- my $self = bless $proto->SUPER::new(shift, shift, shift);
-
- # All other variables come from the wizard.
-}
-
-sub render {
- my $self = shift;
- my $wizard = $self->{WIZARD};
- my $wizvars = $wizard->{VARS};
-
- my $result = '';
-
- $result .= "<form method='get' action='/adm/printout'>\n";
-
- # Nope, I'm lost.
- $result .= "</form>";
}
1;