version 1.128, 2005/11/22 12:49:50
|
version 1.137, 2006/04/24 23:05:35
|
Line 573 sub display {
|
Line 573 sub display {
|
} |
} |
|
|
# Phase 4: Display. |
# Phase 4: Display. |
my $html=&Apache::lonxml::xmlbegin(); |
|
my $stateTitle=&mt($state->title()); |
my $stateTitle=&mt($state->title()); |
my $helperTitle = &mt($self->{TITLE}); |
my $browser_searcher_js = |
my $bodytag = &Apache::loncommon::bodytag($helperTitle,'',''); |
'<script type="text/javascript">'."\n". |
|
&Apache::loncommon::browser_and_searcher_javascript(). |
|
"\n".'</script>'; |
|
|
|
$result .= &Apache::loncommon::start_page($self->{TITLE}, |
|
$browser_searcher_js); |
|
|
my $previous = HTML::Entities::encode(&mt("<- Previous"), '<>&"'); |
my $previous = HTML::Entities::encode(&mt("<- Previous"), '<>&"'); |
my $next = HTML::Entities::encode(&mt("Next ->"), '<>&"'); |
my $next = HTML::Entities::encode(&mt("Next ->"), '<>&"'); |
# FIXME: This should be parameterized, not concatenated - Jeremy |
# FIXME: This should be parameterized, not concatenated - Jeremy |
my $loncapaHelper = &mt("LON-CAPA Helper:"); |
|
|
|
$result .= <<HEADER; |
|
$html |
|
<head> |
|
<title>$loncapaHelper: $helperTitle</title> |
|
</head> |
|
$bodytag |
|
HEADER |
|
if (!$state->overrideForm()) { $result.="<form name='helpform' method='POST'>"; } |
if (!$state->overrideForm()) { $result.="<form name='helpform' method='POST'>"; } |
$result .= <<HEADER; |
$result .= <<HEADER; |
<table border="0" width='100%'><tr><td> |
<table border="0" width='100%'><tr><td> |
Line 651 HEADER
|
Line 649 HEADER
|
</tr> |
</tr> |
</table> |
</table> |
</form> |
</form> |
</body> |
|
</html> |
|
FOOTER |
FOOTER |
|
|
|
$result .= &Apache::loncommon::end_page(); |
# Handle writing out the vars to the file |
# Handle writing out the vars to the file |
my $file = Apache::File->new('>'.$self->{FILENAME}); |
my $file = Apache::File->new('>'.$self->{FILENAME}); |
print $file $self->_varsInFile(); |
print $file $self->_varsInFile(); |
Line 1072 will be the state transistioned to if th
|
Line 1069 will be the state transistioned to if th
|
the choice is not multichoice. This will override the nextstate |
the choice is not multichoice. This will override the nextstate |
passed to the parent C<choices> tag. |
passed to the parent C<choices> tag. |
|
|
|
<choice> may optionally contain a 'relatedvalue' attribute, which |
|
if present will cause a text entry to appear to the right of the |
|
selection. The value of the relatedvalue attribute is a variable |
|
into which the text entry will be stored e.g.: |
|
<choice computer='numberprovided" relatedvalue="num">Type the number in:</choice> |
|
|
|
<choice> may contain a relatededefault atribute which, if the |
|
relatedvalue attribute is present will be the initial value of the input |
|
box. |
|
|
=back |
=back |
|
|
To create the choices programmatically, either wrap the choices in |
To create the choices programmatically, either wrap the choices in |
Line 1162 sub start_choice {
|
Line 1169 sub start_choice {
|
my $computer = $token->[2]{'computer'}; |
my $computer = $token->[2]{'computer'}; |
my $human = &mt(&Apache::lonxml::get_all_text('/choice', |
my $human = &mt(&Apache::lonxml::get_all_text('/choice', |
$parser)); |
$parser)); |
my $nextstate = $token->[2]{'nextstate'}; |
my $nextstate = $token->[2]{'nextstate'}; |
my $evalFlag = $token->[2]{'eval'}; |
my $evalFlag = $token->[2]{'eval'}; |
|
my $relatedVar = $token->[2]{'relatedvalue'}; |
|
my $relatedDefault = $token->[2]{'relateddefault'}; |
push @{$paramHash->{CHOICES}}, [&mtn($human), $computer, $nextstate, |
push @{$paramHash->{CHOICES}}, [&mtn($human), $computer, $nextstate, |
$evalFlag]; |
$evalFlag, $relatedVar, $relatedDefault]; |
return ''; |
return ''; |
} |
} |
|
|
Line 1275 BUTTONS
|
Line 1284 BUTTONS
|
} |
} |
$result .= qq{id="id$id"}; |
$result .= qq{id="id$id"}; |
my $choiceLabel = $choice->[0]; |
my $choiceLabel = $choice->[0]; |
if ($choice->[4]) { # if we need to evaluate this choice |
if ($choice->[3]) { # if we need to evaluate this choice |
$choiceLabel = "sub { my $helper = shift; my $state = shift;" . |
$choiceLabel = "sub { my $helper = shift; my $state = shift;" . |
$choiceLabel . "}"; |
$choiceLabel . "}"; |
$choiceLabel = eval($choiceLabel); |
$choiceLabel = eval($choiceLabel); |
$choiceLabel = &$choiceLabel($helper, $self); |
$choiceLabel = &$choiceLabel($helper, $self); |
} |
} |
$result .= "/></td><td> ".qq{<label for="id$id">}. |
$result .= "/></td><td> ".qq{<label for="id$id">}. |
$choiceLabel. "</label></td></tr>\n"; |
$choiceLabel. "</label></td>"; |
|
if ($choice->[4]) { |
|
$result .='<td><input type="text" size="5" name="' |
|
.$choice->[4].'.forminput" value="' |
|
.$choice->[5].'" /></td>'; |
|
} |
|
$result .= "</tr>\n"; |
} |
} |
$result .= "</table>\n\n\n"; |
$result .= "</table>\n\n\n"; |
$result .= $buttons; |
$result .= $buttons; |
Line 1316 sub postprocess {
|
Line 1331 sub postprocess {
|
$helper->changeState($choice->[2]); |
$helper->changeState($choice->[2]); |
} |
} |
} |
} |
|
if ($choice->[4]) { |
|
my $varname = $choice->[4]; |
|
$helper->{'VARS'}->{$varname} = $env{'form.'."$varname.forminput"}; |
|
} |
} |
} |
return 1; |
return 1; |
} |
} |
Line 1559 sub render {
|
Line 1578 sub render {
|
my $time=time; |
my $time=time; |
my ($anytime,$onclick); |
my ($anytime,$onclick); |
|
|
if (defined($self->{DEFAULT_VALUE})) { |
|
|
# first check VARS for a valid new value from the user |
|
# then check DEFAULT_VALUE for a valid default time value |
|
# otherwise pick now as reasonably good time |
|
|
|
if (defined($helper->{VARS}{$var}) |
|
&& $helper->{VARS}{$var} > 0) { |
|
$date = localtime($helper->{VARS}{$var}); |
|
} elsif (defined($self->{DEFAULT_VALUE})) { |
my $valueFunc = eval($self->{DEFAULT_VALUE}); |
my $valueFunc = eval($self->{DEFAULT_VALUE}); |
die('Error in default value code for variable ' . |
die('Error in default value code for variable ' . |
$self->{'variable'} . ', Perl said: ' . $@) if $@; |
$self->{'variable'} . ', Perl said: ' . $@) if $@; |
$time = &$valueFunc($helper, $self); |
$time = &$valueFunc($helper, $self); |
if (lc($time) eq 'anytime') { $time=time; $anytime=1; } |
if (lc($time) eq 'anytime') { |
|
$anytime=1; |
|
$date = localtime(time); |
|
$date->min(0); |
|
} elsif (defined($time) && $time ne 0) { |
|
$date = localtime($time); |
|
} else { |
|
# leave date undefined so it'll default to now |
|
} |
} |
} |
|
|
|
if (!defined($date) && !$anytime) { |
|
$date = localtime(time); |
|
$date->min(0); |
|
} |
|
|
|
&Apache::lonnet::logthis("date mode "); |
|
|
if ($anytime) { |
if ($anytime) { |
$onclick = "onclick=\"javascript:updateCheck(this.form,'${var}anytime',false)\""; |
$onclick = "onclick=\"javascript:updateCheck(this.form,'${var}anytime',false)\""; |
} |
} |
# Default date: The current hour. |
# Default date: The current hour. |
$date = localtime($time); |
|
$date->min(0); |
|
|
|
if (defined $self->{ERROR_MSG}) { |
if (defined $self->{ERROR_MSG}) { |
$result .= '<font color="#FF0000">' . $self->{ERROR_MSG} . '</font><br /><br />'; |
$result .= '<font color="#FF0000">' . $self->{ERROR_MSG} . '</font><br /><br />'; |
Line 1722 sub postprocess {
|
Line 1763 sub postprocess {
|
$helper->{VARS}->{$var} = $chosenDate; |
$helper->{VARS}->{$var} = $chosenDate; |
} |
} |
|
|
|
if (defined($self->{VALIDATOR})) { |
|
my $validator = eval($self->{VALIDATOR}); |
|
die 'Died during evaluation of evaulation code; Perl said: ' . $@ if $@; |
|
my $invalid = &$validator($helper, $state, $self, $self->getValue()); |
|
if ($invalid) { |
|
$self->{ERROR_MSG} = $invalid; |
|
return 0; |
|
} |
|
} |
|
|
if (defined($self->{NEXTSTATE})) { |
if (defined($self->{NEXTSTATE})) { |
$helper->changeState($self->{NEXTSTATE}); |
$helper->changeState($self->{NEXTSTATE}); |
} |
} |
Line 2296 sub render {
|
Line 2347 sub render {
|
} |
} |
} |
} |
} |
} |
|
function checkexpired() { |
|
for (i=0; i<document.forms.helpform.elements.length; i++) { |
|
if (document.forms.helpform.elements[i].value.indexOf(':Expired') != -1) { |
|
document.forms.helpform.elements[i].checked=true; |
|
} |
|
} |
|
} |
function uncheckexpired() { |
function uncheckexpired() { |
for (i=0; i<document.forms.helpform.elements.length; i++) { |
for (i=0; i<document.forms.helpform.elements.length; i++) { |
if (document.forms.helpform.elements[i].value.indexOf(':Expired') != -1) { |
if (document.forms.helpform.elements[i].value.indexOf(':Expired') != -1) { |
Line 2364 SCRIPT
|
Line 2422 SCRIPT
|
</table> |
</table> |
<br /> |
<br /> |
BUTTONS |
BUTTONS |
|
$result .= $buttons; |
|
|
} |
} |
|
|
if (defined $self->{ERROR_MSG}) { |
if (defined $self->{ERROR_MSG}) { |
Line 2383 BUTTONS
|
Line 2443 BUTTONS
|
delete($defaultUsers{''}); |
delete($defaultUsers{''}); |
} |
} |
my $choices = []; |
my $choices = []; |
|
my $expired_students = []; # Will hold expired students. |
|
|
# Load up the non-students, if necessary |
# Load up the non-students, if necessary |
if ($self->{'coursepersonnel'}) { |
if ($self->{'coursepersonnel'}) { |
Line 2420 BUTTONS
|
Line 2481 BUTTONS
|
} |
} |
return $classlist->{$a}->[$fullname] cmp $classlist->{$b}->[$fullname]; |
return $classlist->{$a}->[$fullname] cmp $classlist->{$b}->[$fullname]; |
} @keys; |
} @keys; |
|
# |
|
# now add the fancy section choice... first enumerate the sections: |
|
if ($self->{'multichoice'}) { |
|
my %sections; |
|
for my $key (@keys) { |
|
my $section_name = $classlist->{$key}->[$section]; |
|
if ($section_name ne "") { |
|
$sections{$section_name} = 1; |
|
} |
|
} |
|
# The variable $choice_widget will have the html to make the choice |
|
# selector. |
|
my $size=5; |
|
if (scalar(keys(%sections)) < 5) { |
|
$size=scalar(keys(%sections)); |
|
} |
|
my $choice_widget = '<select multiple name="chosensections" size="'.$size.'">'."\n"; |
|
foreach my $sec (sort {lc($a) cmp lc($b)} (keys(%sections))) { |
|
$choice_widget .= "<option name=\"$sec\">$sec</option>\n"; |
|
} |
|
$choice_widget .= "<option>none</option></select>\n"; |
|
|
|
# Build a table without any borders to contain the section based |
|
# selection: |
|
|
|
my $section_selectors =<<SECTIONSELECT; |
|
<table border="0"> |
|
<tr valign="top"> |
|
<td>For Sections:</td><td>$choice_widget</td> |
|
<td><label><input type="radio" name="personstate" value="Active" checked /> |
|
Current Students</label></td> |
|
<td><label><input type="radio" name="personstate" value="All" /> |
|
All students</label></td> |
|
<td><label><input type="radio" name="personstate" value="Expired" /> |
|
Expired Students</label></td> |
|
</tr> |
|
<tr> |
|
<td><input type="button" value="Select" onclick="checksections(true);" /></td> |
|
<td><input type="button" value="Unselect" onclick="checksections(false);" /></td></tr> |
|
</table> |
|
<br /> |
|
SECTIONSELECT |
|
$result .= $section_selectors; |
|
} |
|
|
# username, fullname, section, type |
# username, fullname, section, type |
for (@keys) { |
for (@keys) { |
# Filter out inactive students if we've set "activeonly" |
|
if (!$self->{'activeonly'} || $classlist->{$_}->[$status] eq |
# We split the active students into the choices array and |
|
# inactive ones into expired_students so that we can put them in 2 separate |
|
# tables. |
|
|
|
if ( $classlist->{$_}->[$status] eq |
'Active') { |
'Active') { |
push @$choices, [$_, $classlist->{$_}->[$fullname], |
push @$choices, [$_, $classlist->{$_}->[$fullname], |
$classlist->{$_}->[$section], |
$classlist->{$_}->[$section], |
$classlist->{$_}->[$status], 'Student']; |
$classlist->{$_}->[$status], 'Student']; |
|
} else { |
|
push @$expired_students, [$_, $classlist->{$_}->[$fullname], |
|
$classlist->{$_}->[$section], |
|
$classlist->{$_}->[$status], 'Student']; |
} |
} |
} |
} |
|
|
Line 2443 BUTTONS
|
Line 2556 BUTTONS
|
"<td align='center'><b>".&mt('Username').":".&mt('Domain')."</b></td></tr>"; |
"<td align='center'><b>".&mt('Username').":".&mt('Domain')."</b></td></tr>"; |
|
|
my $checked = 0; |
my $checked = 0; |
|
# |
|
# Give the active students and staff: |
|
# |
for my $choice (@$choices) { |
for my $choice (@$choices) { |
$result .= "<tr><td><input type='$type' name='" . |
$result .= "<tr><td><input type='$type' name='" . |
$self->{'variable'} . '.forminput' . "'"; |
$self->{'variable'} . '.forminput' . "'"; |
Line 2474 BUTTONS
|
Line 2590 BUTTONS
|
. HTML::Entities::encode($choice->[0],'<>&"') |
. HTML::Entities::encode($choice->[0],'<>&"') |
. "</td></tr>\n"; |
. "</td></tr>\n"; |
} |
} |
|
|
$result .= "</table>\n\n"; |
$result .= "</table>\n\n"; |
$result .= $buttons; |
|
|
# If activeonly is not set then we can also give the expired students: |
# |
# |
# now add the fancy section choice... first enumerate the sections: |
if (!$self->{'activeonly'} && ((scalar @$expired_students) > 0)) { |
if ($self->{'multichoice'}) { |
$result .= "<p>Inactive students: </p>\n"; |
my %sections; |
$result .= <<INACTIVEBUTTONS; |
for my $key (@keys) { |
<table> |
my $section_name = $classlist->{$key}->[$section]; |
<tr> |
if ($section_name ne "") { |
<td><input type="button" value="Select expired" onclick="checkexpired();" /> </td> |
$sections{$section_name} = 1; |
<td><input type="button" value="Unselect expired" onclick="uncheckexpired();" /></td> |
|
</tr> |
|
</table> |
|
INACTIVEBUTTONS |
|
$result .= "<table>\n"; |
|
|
|
for my $choice (@$expired_students) { |
|
$result .= "<tr><td><input type='$type' name='" . |
|
$self->{'variable'} . '.forminput' . "'"; |
|
|
|
if (%defaultUsers) { |
|
my $user=$choice->[0]; |
|
if (exists($defaultUsers{$user})) { |
|
$result .= " checked='checked' "; |
|
$checked = 1; |
} |
} |
|
} elsif (!$self->{'multichoice'} && !$checked) { |
|
$result .= " checked='checked' "; |
|
$checked = 1; |
|
} |
|
$result .= |
|
" value='" . HTML::Entities::encode($choice->[0] . ':' |
|
.$choice->[2] . ':' |
|
.$choice->[1] . ':' |
|
.$choice->[3], "<>&\"'") |
|
. "' /></td><td>" |
|
. HTML::Entities::encode($choice->[1],'<>&"') |
|
. "</td><td align='center'>" |
|
. HTML::Entities::encode($choice->[2],'<>&"') |
|
. "</td>\n<td>" |
|
. HTML::Entities::encode($choice->[3],'<>&"') |
|
. "</td>\n<td>" |
|
. HTML::Entities::encode($choice->[4],'<>&"') |
|
. "</td>\n<td>" |
|
. HTML::Entities::encode($choice->[0],'<>&"') |
|
. "</td></tr>\n"; |
} |
} |
# The variable $choice_widget will have the html to make the choice |
$result .= "</table>\n"; |
# selector. |
|
my $size=5; |
} |
if (scalar(keys(%sections)) < 5) { |
|
$size=scalar(keys(%sections)); |
|
} |
|
my $choice_widget = '<select multiple name="chosensections" size="'.$size.'">'."\n"; |
|
foreach my $sec (sort {lc($a) cmp lc($b)} (keys(%sections))) { |
|
$choice_widget .= "<option name=\"$sec\">$sec</option>\n"; |
|
} |
|
$choice_widget .= "<option>none</option></select>\n"; |
|
|
|
# Build a table without any borders to contain the section based |
|
# selection: |
|
|
|
my $section_selectors =<<SECTIONSELECT; |
|
<table border="0"> |
|
<tr valign="top"> |
|
<td>For Sections:</td><td>$choice_widget</td> |
|
<td><label><input type="radio" name="personstate" value="Active" checked /> |
|
Current Students</label></td> |
|
<td><label><input type="radio" name="personstate" value="All" /> |
|
All students</label></td> |
|
<td><label><input type="radio" name="personstate" value="Expired" /> |
|
Expired Students</label></td> |
|
</tr> |
|
<tr> |
|
<td><input type="button" value="Select" onclick="checksections(true);" /></td> |
|
<td><input type="button" value="Unselect" onclick="checksections(false);" /></td></tr> |
|
</table> |
|
<br /> |
|
SECTIONSELECT |
|
$result .= $section_selectors; |
|
} |
|
return $result; |
return $result; |
} |
} |
|
|
Line 2915 package Apache::lonhelper::section;
|
Line 3037 package Apache::lonhelper::section;
|
<section> allows the user to choose one or more sections from the current |
<section> allows the user to choose one or more sections from the current |
course. |
course. |
|
|
It takes the standard attributes "variable", "multichoice", and |
It takes the standard attributes "variable", "multichoice", |
"nextstate", meaning what they do for most other elements. |
"allowempty" and "nextstate", meaning what they do for most other |
|
elements. |
|
|
|
also takes a boolean 'onlysections' whcih will restrict this to only |
|
have sections and not include groups |
|
|
=cut |
=cut |
|
|
Line 2946 sub start_section {
|
Line 3072 sub start_section {
|
$paramHash->{'variable'} = $token->[2]{'variable'}; |
$paramHash->{'variable'} = $token->[2]{'variable'}; |
$helper->declareVar($paramHash->{'variable'}); |
$helper->declareVar($paramHash->{'variable'}); |
$paramHash->{'multichoice'} = $token->[2]{'multichoice'}; |
$paramHash->{'multichoice'} = $token->[2]{'multichoice'}; |
|
$paramHash->{'allowempty'} = $token->[2]{'allowempty'}; |
if (defined($token->[2]{'nextstate'})) { |
if (defined($token->[2]{'nextstate'})) { |
$paramHash->{NEXTSTATE} = $token->[2]{'nextstate'}; |
$paramHash->{NEXTSTATE} = $token->[2]{'nextstate'}; |
} |
} |
Line 2965 sub start_section {
|
Line 3092 sub start_section {
|
} |
} |
|
|
for my $sectionName (sort(keys(%choices))) { |
for my $sectionName (sort(keys(%choices))) { |
|
push @{$paramHash->{CHOICES}}, [$sectionName, $sectionName]; |
push @{$paramHash->{CHOICES}}, [$sectionName, $sectionName]; |
} |
|
return if ($token->[2]{'onlysections'}); |
|
|
|
# add in groups to the end of the list |
|
my %curr_groups; |
|
if (&Apache::loncommon::coursegroups(\%curr_groups)) { |
|
foreach my $group_name (sort(keys(%curr_groups))) { |
|
push(@{$paramHash->{CHOICES}}, [$group_name, $group_name]); |
|
} |
} |
} |
} |
} |
|
|
Line 2986 package Apache::lonhelper::group;
|
Line 3121 package Apache::lonhelper::group;
|
|
|
=head2 Element: groupX<group, helper element> |
=head2 Element: groupX<group, helper element> |
|
|
<section> allows the user to choose one or more groups from the current course. |
<group> allows the user to choose one or more groups from the current course. |
|
|
|
It takes the standard attributes "variable", "multichoice", |
|
"allowempty" and "nextstate", meaning what they do for most other |
|
elements. |
|
|
It takes the standard attributes "variable", "multichoice", and "nextstate", meaning what they do for most other elements. |
|
|
|
=cut |
=cut |
|
|
no strict; |
no strict; |
Line 3018 sub start_group {
|
Line 3155 sub start_group {
|
$paramHash->{'variable'} = $token->[2]{'variable'}; |
$paramHash->{'variable'} = $token->[2]{'variable'}; |
$helper->declareVar($paramHash->{'variable'}); |
$helper->declareVar($paramHash->{'variable'}); |
$paramHash->{'multichoice'} = $token->[2]{'multichoice'}; |
$paramHash->{'multichoice'} = $token->[2]{'multichoice'}; |
|
$paramHash->{'allowempty'} = $token->[2]{'allowempty'}; |
if (defined($token->[2]{'nextstate'})) { |
if (defined($token->[2]{'nextstate'})) { |
$paramHash->{NEXTSTATE} = $token->[2]{'nextstate'}; |
$paramHash->{NEXTSTATE} = $token->[2]{'nextstate'}; |
} |
} |
Line 3025 sub start_group {
|
Line 3163 sub start_group {
|
# Populate the CHOICES element |
# Populate the CHOICES element |
my %choices; |
my %choices; |
|
|
my $numgroups; |
|
my %curr_groups; |
my %curr_groups; |
if (&Apache::loncommon::coursegroups(\%curr_groups)) { |
if (&Apache::loncommon::coursegroups(\%curr_groups)) { |
foreach my $group_name (keys %curr_groups) { |
foreach my $group_name (sort(keys(%curr_groups))) { |
$choices{$group_name} = $group_name; |
push(@{$paramHash->{CHOICES}}, [$group_name, $group_name]); |
} |
} |
} |
|
foreach my $group_name (sort(keys(%choices))) { |
|
push @{$paramHash->{CHOICES}}, [$group_name, $group_name]; |
|
} |
} |
} |
} |
|
|
sub end_group { |
sub end_group { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
|
|