[LON-CAPA-cvs] cvs: loncom /interface lonprintout.pm
bowersj2
lon-capa-cvs@mail.lon-capa.org
Fri, 02 May 2003 19:18:39 -0000
This is a MIME encoded message
--bowersj21051903119
Content-Type: text/plain
bowersj2 Fri May 2 15:18:39 2003 EDT
Modified files:
/loncom/interface lonprintout.pm
Log:
Added page format state when the user selects one column.
Resource pages other then "whole course" now no longer recurse. (Will
require update in lonhelper.pm to see.)
--bowersj21051903119
Content-Type: text/plain
Content-Disposition: attachment; filename="bowersj2-20030502151839.txt"
Index: loncom/interface/lonprintout.pm
diff -u loncom/interface/lonprintout.pm:1.143 loncom/interface/lonprintout.pm:1.144
--- loncom/interface/lonprintout.pm:1.143 Fri May 2 11:48:26 2003
+++ loncom/interface/lonprintout.pm Fri May 2 15:18:39 2003
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Printout
#
-# $Id: lonprintout.pm,v 1.143 2003/05/02 15:48:26 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.144 2003/05/02 19:18:39 bowersj2 Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1821,7 +1821,7 @@
my $paramHash;
# We can always print the current screen.
- push @{$printChoices}, ["<b>$resourceTitle</b> (exactly what was on the screen)", 'current_document', 'FINAL'];
+ push @{$printChoices}, ["<b>$resourceTitle</b> (exactly what was on the screen)", 'current_document', 'PAGESIZE'];
# If we're in a sequence...
if ($helper->{VARS}->{'postdata'} =~ /\/res\//) {
@@ -1837,8 +1837,8 @@
my $helperFragment = <<HELPERFRAGMENT;
<state name="CHOOSE_PROBLEMS" title="Select Problems">
<message>Select problems to print:</message>
- <resource variable="RESOURCES" multichoice="1">
- <nextstate>FINAL</nextstate>
+ <resource variable="RESOURCES" multichoice="1" toponly='1'>
+ <nextstate>PAGESIZE</nextstate>
<filterfunc>return $isProblemOrMap</filterfunc>
<choicefunc>return $isProblem</choicefunc>
<mapurl>$map</mapurl>
@@ -1848,8 +1848,8 @@
<state name="CHOOSE_PROBLEMS_HTML" title="Select Resources">
<message>Select resources to print:</message>
- <resource variable="RESOURCES" multichoice="1">
- <nextstate>FINAL</nextstate>
+ <resource variable="RESOURCES" multichoice="1" toponly='1'>
+ <nextstate>PAGESIZE</nextstate>
<choicefunc>return $isNotMap;</choicefunc>
<mapurl>$map</mapurl>
<valuefunc>return $symb</valuefunc>
@@ -1873,7 +1873,7 @@
<state name="ALL_PROBLEMS" title="Select Problems">
<message>Select problems to print:</message>
<resource variable="RESOURCES" multichoice="1">
- <nextstate>FINAL</nextstate>
+ <nextstate>PAGESIZE</nextstate>
<filterfunc>return $isProblemOrMap</filterfunc>
<choicefunc>return $isProblem</choicefunc>
<valuefunc>return $symb</valuefunc>
@@ -1882,7 +1882,7 @@
<state name="CHOOSE_STUDENTS" title="Choose Students">
<message>Select the students you wish to print the problems for:</message>
- <student multichoice='1' variable="STUDENTS" nextstate="FINAL" />
+ <student multichoice='1' variable="STUDENTS" nextstate="PAGESIZE" />
</state>
CHOOSE_STUDENTS
}
@@ -1896,7 +1896,7 @@
<state name="CHOOSE_FROM_SUBDIR" title="Select Files">
<message>Select problems you wish to print from <b>$subdir</b></message>
<files variable="FILES" multichoice='1'>
- <nextstate>FINAL</nextstate>
+ <nextstate>PAGESIZE</nextstate>
<filechoice>return '$subdir';</filechoice>
CHOOSE_FROM_SUBDIR
@@ -1922,6 +1922,12 @@
Apache::lonhelper::choices->new();
Apache::lonprintout::page_format_state->new("FORMAT");
+ # Generate the PAGESIZE state which will offer the user the margin
+ # choices if they select one column
+ Apache::lonhelper::state->new("PAGESIZE", "Set Margins");
+ Apache::lonprintout::page_size_state->new('pagesize', 'FORMAT', 'FINAL');
+
+
$helper->process();
# MANUAL BAILOUT CONDITION:
@@ -1999,9 +2005,6 @@
my $helper = Apache::lonhelper::getHelper();
my $result = '';
my $var = $self->{'variable'};
- my $curVal = $helper->{VARS}->{$var};
-
- my ($layout, $cols, $paper) = split(/\|/, $curVal);
$result .= <<STATEHTML;
@@ -2023,7 +2026,7 @@
my $i;
for ($i = 1; $i <= $maxColumns; $i++) {
- if ($i == $cols) {
+ if ($i == 2) {
$result .= "<option value='$i' selected>$i</option>\n";
} else {
$result .= "<option value='$i'>$i</option>\n";
@@ -2035,7 +2038,7 @@
$i = 0;
foreach (@paperSize) {
- if ($paper == $i) {
+ if ($i == 0) {
$result .= "<option selected value='$i'>" . $paperSize[$i] . "</option>\n";
} else {
$result .= "<option value='$i'>" . $paperSize[$i] . "</option>\n";
@@ -2059,6 +2062,161 @@
}
1;
+
+package Apache::lonprintout::page_size_state;
+
+=pod
+
+=head1 Helper element: page_size_state
+
+See lonhelper.pm documentation for discussion of the helper framework.
+
+Apache::lonprintout::page_size_state is an element that gives the
+user the opportunity to further refine the page settings if they
+select a single-column page.
+
+page_size_state is always directly invoked in lonprintout.pm, so there
+is no tag interface. You actually pass parameters to the constructor.
+
+=over 4
+
+=item * B<new>(varName): varName is where the print information will be stored in the format FIXME.
+
+=back
+
+=cut
+
+use Apache::lonhelper;
+
+no strict;
+@ISA = ("Apache::lonhelper::element");
+use strict;
+
+
+
+sub new {
+ my $self = Apache::lonhelper::element->new();
+
+ shift; # disturbs me (probably prevents subclassing) but works (drops
+ # package descriptor)... - Jeremy
+
+ $self->{'variable'} = shift;
+ my $helper = Apache::lonhelper::getHelper();
+ $helper->declareVar($self->{'variable'});
+
+ # The variable name of the format element, so we can look into
+ # $helper->{VARS} to figure out whether the columns are one or two
+ $self->{'formatvar'} = shift;
+
+ # The state to transition to after selection, or after discovering
+ # the cols are not set to 1
+ $self->{NEXTSTATE} = shift;
+ bless($self);
+ return $self;
+}
+
+sub render {
+ my $self = shift;
+ my $helper = Apache::lonhelper::getHelper();
+ my $result = '';
+ my $var = $self->{'variable'};
+
+ if (defined $self->{ERROR_MSG}) {
+ $result .= '<br /><font color="#FF0000">' . $self->{ERROR_MSG} . '</font><br />';
+ }
+
+ $result .= <<ELEMENTHTML;
+
+<p>How should the column be formatted?</p>
+
+<table cellpadding='3'>
+ <tr>
+ <td align='right'><b>Width</b>:</td>
+ <td align='left'><input type='text' name='$var.width' value='18' size='4'></td>
+ <td align='left'>
+ <select name='$var.widthunit'>
+ <option>cm</option><option>in</option>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td align='right'><b>Height</b>:</td>
+ <td align='left'><input type='text' name="$var.height" value="25.9" size='4'></td>
+ <td align='left'>
+ <select name='$var.heightunit'>
+ <option>cm</option><option>in</option>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td align='right'><b>Left margin</b>:</td>
+ <td align='left'><input type='text' name='$var.lmargin' value='-1.5' size='4'></td>
+ <td align='left'>
+ <select name='$var.heightunit'>
+ <option>cm</option><option>in</option>
+ </select>
+ </td>
+ </tr>
+</table>
+
+<p>Hint: Some instructors like to leave scratch space for the student by
+making the width much smaller then the width of the page.</p>
+
+ELEMENTHTML
+
+ return $result;
+}
+
+# If the user didn't select 1 column, skip this state.
+sub preprocess {
+ my $self = shift;
+ my $helper = Apache::lonhelper::getHelper();
+
+ my $format = $helper->{VARS}->{$self->{'formatvar'}};
+ if (substr($format, 2, 1) ne '1') {
+ $helper->changeState($self->{NEXTSTATE});
+ }
+
+ return 1;
+}
+
+sub postprocess {
+ my $self = shift;
+
+ my $var = $self->{'variable'};
+ my $helper = Apache::lonhelper->getHelper();
+ my $width = $helper->{VARS}->{$var .'.width'} = $ENV{"form.${var}.width"};
+ my $height = $helper->{VARS}->{$var .'.height'} = $ENV{"form.${var}.height"};
+ my $lmargin = $helper->{VARS}->{$var .'.lmargin'} = $ENV{"form.${var}.lmargin"};
+ $helper->{VARS}->{$var .'.widthunit'} = $ENV{"form.${var}.widthunit"};
+ $helper->{VARS}->{$var .'.heightunit'} = $ENV{"form.${var}.heightunit"};
+ $helper->{VARS}->{$var .'.lmarginunit'} = $ENV{"form.${var}.lmarginunit"};
+
+ my $error = '';
+
+ # /^-?[0-9]+(\.[0-9]*)?$/ -> optional minus, at least on digit, followed
+ # by an optional period, followed by digits, ending the string
+
+ if ($width !~ /^-?[0-9]+(\.[0-9]*)?$/) {
+ $error .= "Invalid width; please type only a number.<br />\n";
+ }
+ if ($height !~ /^-?[0-9]+(\.[0-9]*)?$/) {
+ $error .= "Invalid height; please type only a number.<br />\n";
+ }
+ if ($lmargin !~ /^-?[0-9]+(\.[0-9]*)?$/) {
+ $error .= "Invalid left margin; please type only a number.<br />\n";
+ }
+
+ if (!$error) {
+ Apache::lonhelper::getHelper()->changeState($self->{NEXTSTATE});
+ return 1;
+ } else {
+ $self->{ERROR_MSG} = $error;
+ return 0;
+ }
+}
+
+
__END__
--bowersj21051903119--