--- loncom/interface/lonhelper.pm 2005/11/22 12:49:50 1.128
+++ loncom/interface/lonhelper.pm 2006/03/06 23:32:31 1.132
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# .helper XML handler to implement the LON-CAPA helper
#
-# $Id: lonhelper.pm,v 1.128 2005/11/22 12:49:50 raeburn Exp $
+# $Id: lonhelper.pm,v 1.132 2006/03/06 23:32:31 foxr Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -576,6 +576,7 @@ sub display {
my $html=&Apache::lonxml::xmlbegin();
my $stateTitle=&mt($state->title());
my $helperTitle = &mt($self->{TITLE});
+ my $browser_searcher_js = &Apache::loncommon::browser_and_searcher_javascript();
my $bodytag = &Apache::loncommon::bodytag($helperTitle,'','');
my $previous = HTML::Entities::encode(&mt("<- Previous"), '<>&"');
my $next = HTML::Entities::encode(&mt("Next ->"), '<>&"');
@@ -586,6 +587,9 @@ sub display {
$html
<head>
<title>$loncapaHelper: $helperTitle</title>
+ <script type="text/javascript">
+$browser_searcher_js
+ </script>
</head>
$bodytag
HEADER
@@ -1557,6 +1561,8 @@ sub render {
my $date;
my $time=time;
+ $date = localtime($time);
+ $date->min(0);
my ($anytime,$onclick);
if (defined($self->{DEFAULT_VALUE})) {
@@ -1564,14 +1570,18 @@ sub render {
die('Error in default value code for variable ' .
$self->{'variable'} . ', Perl said: ' . $@) if $@;
$time = &$valueFunc($helper, $self);
- if (lc($time) eq 'anytime') { $time=time; $anytime=1; }
+ if (lc($time) eq 'anytime') {
+ $anytime=1;
+ } else {
+ $date = localtime($time);
+ }
+ } else {
+
}
if ($anytime) {
$onclick = "onclick=\"javascript:updateCheck(this.form,'${var}anytime',false)\"";
}
# Default date: The current hour.
- $date = localtime($time);
- $date->min(0);
if (defined $self->{ERROR_MSG}) {
$result .= '<font color="#FF0000">' . $self->{ERROR_MSG} . '</font><br /><br />';
@@ -2296,6 +2306,13 @@ 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() {
for (i=0; i<document.forms.helpform.elements.length; i++) {
if (document.forms.helpform.elements[i].value.indexOf(':Expired') != -1) {
@@ -2364,6 +2381,8 @@ SCRIPT
</table>
<br />
BUTTONS
+ $result .= $buttons;
+
}
if (defined $self->{ERROR_MSG}) {
@@ -2383,6 +2402,7 @@ BUTTONS
delete($defaultUsers{''});
}
my $choices = [];
+ my $expired_students = []; # Will hold expired students.
# Load up the non-students, if necessary
if ($self->{'coursepersonnel'}) {
@@ -2420,15 +2440,67 @@ BUTTONS
}
return $classlist->{$a}->[$fullname] cmp $classlist->{$b}->[$fullname];
} @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
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') {
push @$choices, [$_, $classlist->{$_}->[$fullname],
$classlist->{$_}->[$section],
$classlist->{$_}->[$status], 'Student'];
+ } else {
+ push @$expired_students, [$_, $classlist->{$_}->[$fullname],
+ $classlist->{$_}->[$section],
+ $classlist->{$_}->[$status], 'Student'];
}
}
@@ -2443,6 +2515,9 @@ BUTTONS
"<td align='center'><b>".&mt('Username').":".&mt('Domain')."</b></td></tr>";
my $checked = 0;
+ #
+ # Give the active students and staff:
+ #
for my $choice (@$choices) {
$result .= "<tr><td><input type='$type' name='" .
$self->{'variable'} . '.forminput' . "'";
@@ -2474,53 +2549,59 @@ BUTTONS
. HTML::Entities::encode($choice->[0],'<>&"')
. "</td></tr>\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->{'multichoice'}) {
- my %sections;
- for my $key (@keys) {
- my $section_name = $classlist->{$key}->[$section];
- if ($section_name ne "") {
- $sections{$section_name} = 1;
+ if (!$self->{'activeonly'} && ((scalar @$expired_students) > 0)) {
+ $result .= "<p>Inactive students: </p>\n";
+ $result .= <<INACTIVEBUTTONS;
+ <table>
+ <tr>
+ <td><input type="button" value="Select expired" onclick="checkexpired();" /> </td>
+ <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
- # 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";
+ $result .= "</table>\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;
}