[LON-CAPA-cvs] cvs: loncom /interface lonprintout.pm lonwizard.pm
bowersj2
lon-capa-cvs@mail.lon-capa.org
Fri, 28 Feb 2003 23:42:18 -0000
This is a MIME encoded message
--bowersj21046475738
Content-Type: text/plain
bowersj2 Fri Feb 28 18:42:18 2003 EDT
Modified files:
/loncom/interface lonwizard.pm lonprintout.pm
Log:
Can't CVS f'in check for updated-ness *before* I write a lengthy commit
message?
Fixing some stylistic issues.
message_after parameter dropped from all states due to Rule of Three;
three wizards have been built and none of them need it, so axe the
feature.
Removed a couple of places where there was code trying to handle the
user going back, before I realized I could just lean on the browser's
"back" button to do a better job then I could code.
--bowersj21046475738
Content-Type: text/plain
Content-Disposition: attachment; filename="bowersj2-20030228184218.txt"
Index: loncom/interface/lonwizard.pm
diff -u loncom/interface/lonwizard.pm:1.14 loncom/interface/lonwizard.pm:1.15
--- loncom/interface/lonwizard.pm:1.14 Thu Feb 27 16:01:09 2003
+++ loncom/interface/lonwizard.pm Fri Feb 28 18:42:18 2003
@@ -9,9 +9,9 @@
=head1 lonwizard - HTML "Wizard" framework for LON-CAPA
-I know how most developers feel about Wizards, but the fact is they are a well-established UI widget that users feel comfortable with. It can take a complicated multi-dimensional problem the user has (such as the canonical Course Parameter example) and turn in into a series of bite-sized one-dimensional questions. Or take the some four-question form and put it in a Wizard, and present the same user with the same form outside of the Wizard, and the user will *think* the Wizard is easier.
+Wizards are a well-established UI widget that users feel comfortable with. It can take a complicated multi-dimensional problem the user has (such as the canonical Course Parameter example) and turn in into a series of bite-sized one-dimensional questions. Or take the some four-question form and put it in a Wizard, and present the same user with the same form outside of the Wizard, and the user will *think* the Wizard is easier.
-For the developer, wizards do provide an easy way to bundle easy bits of functionality for the user. It can be easier to write a Wizard then provide another custom interface.
+For the developer, wizards do provide an easy way to bundle easy bits of functionality for the user, without having to write the tedious code for maintaining state between frames. It can be easier to write a Wizard then provide another custom interface.
All classes are in the Apache::lonwizard namespace.
@@ -76,8 +76,6 @@
$self->{STATE} = "START";
}
- # set up return URL: Return the user to the referer page, unless the
- # form has stored a value.
if (defined $ENV{"form.RETURN_PAGE"})
{
$self->{RETURN_PAGE} = $ENV{"form.RETURN_PAGE"};
@@ -172,7 +170,7 @@
=pod
-=item B<registerState>(referenceToStateObj): Registers a state as part of the wizard, so the wizard can use it. The 'referenceToStateObj' should be a reference to an instantiated lonwizstate object. This is normally called at the end of the lonwizstate constructor.
+=item B<registerState>(referenceToStateObj): Registers a state as part of the wizard, so the wizard can use it. The 'referenceToStateObj' should be a reference to an instantiated lonwizstate object. This is normally called at the end of the lonwizard::state constructor, so you should not normally need it as a user.
=cut
@@ -201,7 +199,7 @@
=cut
-# Done in five phases
+# Done in four phases
# 1: Do the post processing for the previous state.
# 2: Do the preprocessing for the current state.
# 3: Check to see if state changed, if so, postprocess current and move to next.
@@ -213,9 +211,9 @@
my $result = "";
# Phase 1: Post processing for state of previous screen (which is actually
- # the current state), if it wasn't the beginning state.
- if ($self->{STATE} ne "START" || $ENV{"form.SUBMIT"} eq "Next ->")
- {
+ # the "current state" in terms of the wizard variables), if it wasn't the
+ # beginning state.
+ if ($self->{STATE} ne "START" || $ENV{"form.SUBMIT"} eq "Next ->") {
my $prevState = $self->{STATES}{$self->{STATE}};
$prevState->postprocess();
}
@@ -228,7 +226,8 @@
my $startState = $self->{STATE};
my $state = $self->{STATES}{$startState};
- # Error checking
+ # Error checking; it is intended that the developer will have
+ # checked all paths and the user can't see this!
if (!defined($state)) {
$result .="Error! The state ". $startState ." is not defined.";
return $result;
@@ -268,17 +267,14 @@
if (!$state->overrideForm()) {
$result .= '<center>';
- if ($self->{STATE} ne $self->{START_STATE})
- {
+ if ($self->{STATE} ne $self->{START_STATE}) {
#$result .= '<input name="SUBMIT" type="submit" value="<- Previous" /> ';
}
- if ($self->{DONE})
- {
+ if ($self->{DONE} {
my $returnPage = $self->{RETURN_PAGE};
$result .= "<a href=\"$returnPage\">End Wizard</a>";
}
- else
- {
+ else {
$result .= '<input name="back" type="button" ';
$result .= 'value="<- Previous" onclick="history.go(-1)" /> ';
$result .= '<input name="SUBMIT" type="submit" value="Next ->" />';
@@ -413,8 +409,8 @@
["map", "Every problem in a particular <b>folder</b>", "CHOOSE_FOLDER"],
["resource", "One particular <b>problem</b>", "CHOOSE_RESOURCE"]],
"Which problems do you wish to change a date for?");
- Apache::lonwizard::resource_choice->new($wizard, "CHOOSE_FOLDER", "Select Folder", "Select the folder you wish to set the date for:", "", "CHOOSE_ACTION", "RESOURCE_ID", sub {my $res = shift; return $res->is_map();});
- Apache::lonwizard::resource_choice->new($wizard, "CHOOSE_RESOURCE", "Select Resource", "", "", "CHOOSE_ACTION", "RESOURCE_ID", sub {my $res = shift; return $res->is_map() || $res->is_problem();}, sub {my $res = shift; return $res->is_problem(); });
+ Apache::lonwizard::resource_choice->new($wizard, "CHOOSE_FOLDER", "Select Folder", "Select the folder you wish to set the date for:", "CHOOSE_ACTION", "RESOURCE_ID", sub {my $res = shift; return $res->is_map();});
+ Apache::lonwizard::resource_choice->new($wizard, "CHOOSE_RESOURCE", "Select Resource", "", "CHOOSE_ACTION", "RESOURCE_ID", sub {my $res = shift; return $res->is_map() || $res->is_problem();}, sub {my $res = shift; return $res->is_problem(); });
my $levelType = $levelTypeHash{$wizard->{VARS}->{GRANULARITY}};
Apache::lonwizard::switch_state->new($wizard, "CHOOSE_ACTION", "Parameter Type", "ACTION_TYPE", [
["open_date", "Set an <b>open date</b>", "CHOOSE_DATE"],
@@ -429,8 +425,8 @@
["student", ". . . for an individual <b>student</b>", "CHOOSE_STUDENT"]],
"Set $dateType of $levelType for. . .");
- Apache::lonwizard::choose_section->new($wizard, "CHOOSE_SECTION", "Select Section", "Please select the section you wish to set the $dateType for:", "", "FINISH", "SECTION_NAME");
- Apache::lonwizard::choose_student->new($wizard, "CHOOSE_STUDENT", "Select Student", "Please select the student you wish to set the $dateType for:", "", "FINISH", "USER_NAME");
+ Apache::lonwizard::choose_section->new($wizard, "CHOOSE_SECTION", "Select Section", "Please select the section you wish to set the $dateType for:", "FINISH", "SECTION_NAME");
+ Apache::lonwizard::choose_student->new($wizard, "CHOOSE_STUDENT", "Select Student", "Please select the student you wish to set the $dateType for:", "FINISH", "USER_NAME");
Apache::lonwizard::parmwizfinal->new($wizard, "FINISH", "Confirm Selection");
$r->print($wizard->display());
@@ -626,7 +622,7 @@
=over 4
-=item overridden method B<new>(parentLonWizReference, stateName, stateTitle, messageBefore, messageAfter, nextState, varName, choiceHash, multichoice): messageBefore is the HTML text that will be displayed before the choice display, messageAfter will display after. Keys will be sorted according to human name. nextState is the state to proceed to after the choice. varName is the name of the wizard var to store the computer_name answer in. choiceHash is the hash described above. It is optional because you may override it. multichoice is true if the user can make multiple choices, false otherwise. (Multiple choices will be seperated with ||| in the wizard variable.
+=item overridden method B<new>(parentLonWizReference, stateName, stateTitle, messageBefore, nextState, varName, choiceHash, multichoice): messageBefore is the HTML text that will be displayed before the choice display. Keys will be sorted according to human name. nextState is the state to proceed to after the choice. varName is the name of the wizard var to store the computer_name answer in. choiceHash is the hash described above. It is optional because you may override it. multichoice is true if the user can make multiple choices, false otherwise. (Multiple choices will be seperated with ||| in the wizard variable.
=back
@@ -638,7 +634,6 @@
my $self = bless $proto->SUPER::new(shift, shift, shift);
$self->{MESSAGE_BEFORE} = shift;
- $self->{MESSAGE_AFTER} = shift;
$self->{NEXT_STATE} = shift;
$self->{VAR_NAME} = shift;
$self->{CHOICE_HASH} = shift;
@@ -680,7 +675,8 @@
}
sub determineChoices {
- return {"NO_CHOICE" => "No choices were given."};
+ # Return no choices, which will terminate the wizard
+ return {};
}
sub render {
@@ -730,10 +726,6 @@
. "\"/> " . HTML::Entities::encode($_) . "<br />\n";
}
- if (defined $self->{MESSAGE_AFTER}) {
- $result .= '<br /><br />' . $self->{MESSAGE_AFTER};
- }
-
return $result;
}
@@ -771,7 +763,7 @@
=over 4
-=item overridden method B<new>(parentLonWizReference, stateName, stateTitle, varName, choiceList, messageBefore, messageAfter): varName is the name of the wizard variable the state will set with the choice made. choiceHash is list reference of a list of list references to three element lists, where the first element is what the wizard var varName will be set to, the second is the HTML that will be displayed for that choice, and the third is the destination state. The special setting 'ILLEGAL' can be used in the first place to state that it is not a legal chocie (see lonprintout.pm for real-life usage of that). messageBefore is an optional HTML string that will be placed before the message, messageAfter an optional HTML string that will be placed before.
+=item overridden method B<new>(parentLonWizReference, stateName, stateTitle, varName, choiceList, messageBefore): varName is the name of the wizard variable the state will set with the choice made. choiceHash is list reference of a list of list references to three element lists, where the first element is what the wizard var varName will be set to, the second is the HTML that will be displayed for that choice, and the third is the destination state. The special setting 'ILLEGAL' can be used in the first place to state that it is not a legal chocie (see lonprintout.pm for real-life usage of that). messageBefore is an optional HTML string that will be placed before the message.
Note that ILLEGAL is desirable because some choices may not always be good choices, but they should not necessarily disappear with no explanantion of why they are no good. In lonprintout.pm, for instance, the choice "Problems from current sequence" may be no good because there are no problems in the sequence, but it should not silently disappear; it should announce that there are no problems in the sequence.
@@ -789,7 +781,6 @@
$self->{VAR_NAME} = shift;
$self->{CHOICE_LIST} = shift;
$self->{MESSAGE_BEFORE} = shift;
- $self->{MESSAGE_AFTER} = shift;
return $self;
}
@@ -805,27 +796,24 @@
$result .= $self->{MESSAGE_BEFORE} if (defined $self->{MESSAGE_BEFORE});
- if (!$curVal) {
- $curVal = $self->{CHOICE_LIST}->[0]->[0]; # top is default
- }
-
$result .= "<table>\n\n";
- foreach my $choice (@choices)
- {
+ my $checked = 0;
+ foreach my $choice (@choices) {
my $value = $choice->[0];
my $text = $choice->[1];
$result .= "<tr>\n<td width='20'> </td>\n<td>";
$result .= "<td valign=\"top\"><input type=\"radio\" name=\"$var.forminput\"";
- $result .= " checked" if ($value eq $curVal);
+ if (!$checked) {
+ $result .= " selected";
+ $checked = 1;
+ }
$result .= " value=\"$value\"></td>\n<td>$text</td>\n</tr>\n\n";
}
$result .= "<table>\n\n";
- $result .= $self->{MESSAGE_AFTER} if (defined $self->{MESSAGE_AFTER});
-
return $result;
}
@@ -835,10 +823,8 @@
my $wizard = $self->{WIZARD};
my $chosenValue = $ENV{"form." . $self->{VAR_NAME} . '.forminput'};
- foreach my $choice (@{$self->{CHOICE_LIST}})
- {
- if ($choice->[0] eq $chosenValue)
- {
+ foreach my $choice (@{$self->{CHOICE_LIST}}) {
+ if ($choice->[0] eq $chosenValue) {
$wizard->changeState($choice->[2]);
}
}
@@ -850,8 +836,7 @@
my $choiceList = $self->{CHOICE_LIST};
my $wizard = $self->{WIZARD};
- if (scalar(@{$choiceList}) == 1)
- {
+ if (scalar(@{$choiceList}) == 1) {
my $choice = $choiceList->[0];
my $chosenVal = $choice->[0];
my $nextState = $choice->[2];
@@ -885,7 +870,7 @@
=over 4
-=item overriddent method B<new>(parentLonWizReference, stateName, stateTitle, varName, nextState, messageBefore, messageAfter, displayJustDate): varName is where the date/time will be stored as seconds since the epoch. messageBefore and messageAfter as other states. displayJustDate is a flag defaulting to false that if true, will only display the date selection (defaulting to midnight on that date). Otherwise, minutes and hours will be shown.
+=item overriddent method B<new>(parentLonWizReference, stateName, stateTitle, varName, nextState, messageBefore, displayJustDate): varName is where the date/time will be stored as seconds since the epoch. messageBefore and messageAfter as other states. displayJustDate is a flag defaulting to false that if true, will only display the date selection (defaulting to midnight on that date). Otherwise, minutes and hours will be shown.
=back
@@ -899,7 +884,6 @@
$self->{VAR_NAME} = shift;
$self->{NEXT_STATE} = shift;
$self->{MESSAGE_BEFORE} = shift;
- $self->{MESSAGE_AFTER} = shift;
$self->{DISPLAY_JUST_DATE} = shift;
if (!defined($self->{DISPLAY_JUST_DATE})) {$self->{DISPLAY_JUST_DATE} = 0;}
return $self;
@@ -914,15 +898,8 @@
my $date;
- # Pick default date: Now, or previous choice
- if (defined ($wizvars->{$var}) && $wizvars->{$var} ne "")
- {
- $date = localtime($wizvars->{$var});
- }
- else
- {
- $date = localtime();
- }
+ # Default date: Now
+ $date = localtime($wizvars->{$var});
if (defined $self->{ERROR_MSG}) {
$result .= '<font color="#FF0000">' . $self->{ERROR_MSG} . '</font><br /><br />';
@@ -1058,7 +1035,7 @@
package Apache::lonwizard::parmwizfinal;
# This is the final state for the parmwizard. It is not generally useful,
-# so it is not perldoc'ed. It does it's own processing.
+# so it is not perldoc'ed. It does its own processing.
no strict;
@ISA = ('Apache::lonwizard::state');
@@ -1196,7 +1173,7 @@
=over 4
-=item overridden method B<new>(parentLonWizReference, stateName, stateTitle, messageBefore, messageAfter, nextState, varName, filterFunction, choiceFunction): messageBefore and messageAfter appear before and after the state choice, respectively. nextState is the state to proceed to after the choice. varName is the wizard variable to store the choice in.
+=item overridden method B<new>(parentLonWizReference, stateName, stateTitle, messageBefore, nextState, varName, filterFunction, choiceFunction): messageBefore and messageAfter appear before and after the state choice, respectively. nextState is the state to proceed to after the choice. varName is the wizard variable to store the choice in.
filterFunction is a function reference that receives the current resource as an argument, and returns 1 if it should be displayed, and 0 if it should not be displayed. By default, the class will use sub {return 1;}, which will show all resources. choiceFunction is a reference to a function that receives the resource object as a parameter and returns 1 if it should be a *selectable choice*, and 0 if not. By default, this is the same as the filterFunction, which means all displayed choices will be choosable. See parm wizard for an example of this in the resource selection routines.
@@ -1214,7 +1191,6 @@
my $self = bless $proto->SUPER::new(shift, shift, shift);
$self->{MESSAGE_BEFORE} = shift;
- $self->{MESSAGE_AFTER} = shift;
$self->{NEXT_STATE} = shift;
$self->{VAR_NAME} = shift;
$self->{FILTER_FUNC} = shift;
@@ -1288,6 +1264,8 @@
my $choiceFunc = $self->{CHOICE_FUNC};
# Create the composite function that renders the column on the nav map
+ # have to admit any language that lets me do this can't be all bad
+ # - Jeremy (Pythonista) ;-)
my $renderColFunc = sub {
my ($resource, $part, $params) = @_;
@@ -1311,8 +1289,6 @@
'url' => $wizard->{URL},
'filterFunc' => $filterFunc } );
- $result .= $self->{MESSAGE_AFTER} if (defined $self->{MESSAGE_AFTER});
-
return $result;
}
@@ -1334,7 +1310,7 @@
=over 4
-=item overridden method B<new>(parentLonWizReference, stateName, stateTitle, messageBefore, messageAfter, nextState, varName, filterFunction, choiceFunction, map): Arguments like resource_choice. map is the ID number of a specific map that, if given is all that will be shown to the user, instead of the whole course.
+=item overridden method B<new>(parentLonWizReference, stateName, stateTitle, messageBefore, nextState, varName, filterFunction, choiceFunction, map): Arguments like resource_choice. map is the ID number of a specific map that, if given is all that will be shown to the user, instead of the whole course.
=back
@@ -1350,7 +1326,6 @@
my $self = bless $proto->SUPER::new(shift, shift, shift);
$self->{MESSAGE_BEFORE} = shift;
- $self->{MESSAGE_AFTER} = shift;
$self->{NEXT_STATE} = shift;
$self->{VAR_NAME} = shift;
$self->{FILTER_FUNC} = shift;
@@ -1438,8 +1413,6 @@
$result .= $buttons;
- $result .= $self->{MESSAGE_AFTER} if (defined $self->{MESSAGE_AFTER});
-
return $result;
}
1;
@@ -1500,12 +1473,15 @@
my @keys = keys %{$choices};
# Sort by: Section, name
-
+
+ my $section = Apache::loncoursedata::CL_SECTION();
+ my $fullname = Apache::loncoursedata::CL_FULLNAME();
+
@keys = sort {
- if ($choices->{$a}->[3] ne $choices->{$b}->[3]) {
- return $choices->{$a}->[3] cmp $choices->{$b}->[3];
+ if ($choices->{$a}->[$section] ne $choices->{$b}->[$section]) {
+ return $choices->{$a}->[$section] cmp $choices->{$b}->[$section];
}
- return $choices->{$a}->[6] cmp $choices->{$b}->[6];
+ return $choices->{$a}->[$fullname] cmp $choices->{$b}->[$fullname];
} @keys;
my $type = 'radio';
@@ -1518,9 +1494,10 @@
$result .= "<tr><td><input type='$type' name='" .
$self->{VAR_NAME} . '.forminput' .
"' value='" . HTML::Entities::encode($_)
- . "' /></td><td>" . HTML::Entities::encode($choices->{$_}->[6])
+ . "' /></td><td>"
+ . HTML::Entities::encode($choices->{$_}->[$fullname])
. "</td><td align='center'>"
- . HTML::Entities::encode($choices->{$_}->[5])
+ . HTML::Entities::encode($choices->{$_}->[$section])
. "</td></tr>\n";
}
@@ -1592,7 +1569,7 @@
=over 4
-=item * overridden method B<new>(parentLonWizReference, stateName, stateTitle, messageBefore, messageAfter, nextState, varName, subdir, filterFunc): As in previous states, where filterFunc is as described in choose_file. subdir is the name of the subdirectory to offer choices from.
+=item * overridden method B<new>(parentLonWizReference, stateName, stateTitle, messageBefore, nextState, varName, subdir, filterFunc): As in previous states, where filterFunc is as described in choose_file. subdir is the name of the subdirectory to offer choices from.
=back
@@ -1608,7 +1585,6 @@
my $self = bless $proto->SUPER::new(shift, shift, shift);
$self->{MESSAGE_BEFORE} = shift;
- $self->{MESSAGE_AFTER} = shift;
$self->{NEXT_STATE} = shift;
$self->{VAR_NAME} = shift;
$self->{SUB_DIR} = shift;
@@ -1696,10 +1672,6 @@
}
$result .= $buttons;
-
- if ($self->{MESSAGE_AFTER}) {
- $result .= "<br /><br />" . $self->{MESSAGE_AFTER};
- }
return $result;
}
Index: loncom/interface/lonprintout.pm
diff -u loncom/interface/lonprintout.pm:1.123 loncom/interface/lonprintout.pm:1.124
--- loncom/interface/lonprintout.pm:1.123 Fri Feb 28 12:38:40 2003
+++ loncom/interface/lonprintout.pm Fri Feb 28 18:42:18 2003
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Printout
#
-# $Id: lonprintout.pm,v 1.123 2003/02/28 17:38:40 albertel Exp $
+# $Id: lonprintout.pm,v 1.124 2003/02/28 23:42:18 bowersj2 Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1330,11 +1330,11 @@
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);
+ 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);
+ 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
@@ -1348,7 +1348,7 @@
# 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);
+ 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.
@@ -1360,7 +1360,6 @@
untie %hash;
return OK;
-
}
--bowersj21046475738--