--- loncom/interface/lonhelper.pm	2005/10/11 22:04:27	1.121
+++ loncom/interface/lonhelper.pm	2006/03/07 21:36:49	1.134
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # .helper XML handler to implement the LON-CAPA helper
 #
-# $Id: lonhelper.pm,v 1.121 2005/10/11 22:04:27 albertel Exp $
+# $Id: lonhelper.pm,v 1.134 2006/03/07 21:36:49 albertel 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 />';
@@ -1671,7 +1681,6 @@ sub render {
 // -->
 </script>
 CHECK
-
 	$result.="&nbsp;or&nbsp;<label><input type='checkbox' ";
 	if ($anytime) {
 	    $result.=' checked="checked" '
@@ -2018,6 +2027,18 @@ BUTTONS
 	$mapUrl = $self->{MAP_URL};
     }
 
+    my %defaultSymbs;
+    if (defined($self->{DEFAULT_VALUE})) {
+        my $valueFunc = eval($self->{DEFAULT_VALUE});
+        die 'Error in default value code for variable ' . 
+            $self->{'variable'} . ', Perl said: ' . $@ if $@;
+        my @defaultSymbs = &$valueFunc($helper, $self);
+	if (!$multichoice && @defaultSymbs) { # only allowed 1
+	    @defaultSymbs = ($defaultSymbs[0]);
+	}
+	%defaultSymbs = map { if ($_) {($_,1) } } @defaultSymbs;
+	delete($defaultSymbs{''});
+    }
 
     # 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
@@ -2066,13 +2087,21 @@ BUTTONS
 	    }
 
             $col .= "<td align='center'><input type='$inputType' name='${var}.forminput' ";
-            if (!$checked && !$multichoice) {
-                $col .= "checked='checked' ";
-                $checked = 1;
-            }
-	    if ($multichoice) { # all resources start checked; see bug 1174
-		$col .= "checked='checked' ";
-		$checked = 1;
+	    if (%defaultSymbs) {
+		my $symb=$resource->symb();
+		if (exists($defaultSymbs{$symb})) {
+		    $col .= "checked='checked' ";
+		    $checked = 1;
+		}
+	    } else {
+		if (!$checked && !$multichoice) {
+		    $col .= "checked='checked' ";
+		    $checked = 1;
+		}
+		if ($multichoice) { # all resources start checked; see bug 1174
+		    $col .= "checked='checked' ";
+		    $checked = 1;
+		}
 	    }
             $col .= "value='" . $resource_name  . "' /></td>";
 
@@ -2190,6 +2219,10 @@ selection. Defaults to false.
 If true, only active students and course personnel will be
 shown. Defaults to false.
 
+=item * B<emptyallowed>:
+
+If true, the selection of no users is allowed. Defaults to false.
+
 =back
 
 =cut
@@ -2225,6 +2258,7 @@ sub start_student {
     if (defined($token->[2]{'nextstate'})) {
         $paramHash->{NEXTSTATE} = $token->[2]{'nextstate'};
     }
+    $paramHash->{'emptyallowed'} = $token->[2]{'emptyallowed'};
     
 }    
 
@@ -2272,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) {
@@ -2340,13 +2381,28 @@ SCRIPT
 </table>
 <br />
 BUTTONS
+    $result .= $buttons;   
+
     }
 
     if (defined $self->{ERROR_MSG}) {
         $result .= '<font color="#FF0000">' . $self->{ERROR_MSG} . '</font><br /><br />';
     }
 
+    my %defaultUsers;
+    if (defined($self->{DEFAULT_VALUE})) {
+        my $valueFunc = eval($self->{DEFAULT_VALUE});
+        die 'Error in default value code for variable ' . 
+            $self->{'variable'} . ', Perl said: ' . $@ if $@;
+        my @defaultUsers = &$valueFunc($helper, $self);
+	if (!$self->{'multichoice'} && @defaultUsers) { # only allowed 1
+	    @defaultUsers = ($defaultUsers[0]);
+	}
+	%defaultUsers = map { if ($_) {($_,1) } } @defaultUsers;
+	delete($defaultUsers{''});
+    }
     my $choices = [];
+    my $expired_students = [];	# Will hold expired students.
 
     # Load up the non-students, if necessary
     if ($self->{'coursepersonnel'}) {
@@ -2384,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'];
 	}
     }
 
@@ -2407,11 +2515,20 @@ 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' . "'";
             
-        if (!$self->{'multichoice'} && !$checked) {
+	if (%defaultUsers) {
+	    my $user=$choice->[0];
+	    if (exists($defaultUsers{$user})) {
+		$result .= " checked='checked' ";
+		$checked = 1;
+	    }
+	} elsif (!$self->{'multichoice'} && !$checked) {
             $result .= " checked='checked' ";
             $checked = 1;
         }
@@ -2432,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;
 }
 
@@ -2486,9 +2609,14 @@ sub postprocess {
     my $self = shift;
 
     my $result = $env{'form.' . $self->{'variable'} . '.forminput'};
-    if (!$result) {
-        $self->{ERROR_MSG} = 
-	    &mt('You must choose at least one student to continue.');
+    if (!$result && !$self->{'emptyallowed'}) {
+	if ($self->{'coursepersonnel'}) {
+	    $self->{ERROR_MSG} = 
+		&mt('You must choose at least one user to continue.');
+	} else {
+	    $self->{ERROR_MSG} = 
+		&mt('You must choose at least one student to continue.');
+	}
         return 0;
     }
 
@@ -2868,8 +2996,12 @@ package Apache::lonhelper::section;
 <section> allows the user to choose one or more sections from the current
 course.
 
-It takes the standard attributes "variable", "multichoice", and
-"nextstate", meaning what they do for most other elements.
+It takes the standard attributes "variable", "multichoice",
+"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
 
@@ -2899,6 +3031,7 @@ sub start_section {
     $paramHash->{'variable'} = $token->[2]{'variable'};
     $helper->declareVar($paramHash->{'variable'});
     $paramHash->{'multichoice'} = $token->[2]{'multichoice'};
+    $paramHash->{'allowempty'} = $token->[2]{'allowempty'};
     if (defined($token->[2]{'nextstate'})) {
         $paramHash->{NEXTSTATE} = $token->[2]{'nextstate'};
     }
@@ -2918,8 +3051,16 @@ sub start_section {
     } 
    
     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]);
+	}
     }
 }    
 
@@ -2933,6 +3074,72 @@ sub end_section {
 }    
 1;
 
+package Apache::lonhelper::group;
+
+=pod
+ 
+=head2 Element: groupX<group, helper element>
+ 
+<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.
+
+=cut
+
+no strict;
+@ISA = ("Apache::lonhelper::choices");
+use strict;
+
+BEGIN {
+    &Apache::lonhelper::register('Apache::lonhelper::group',
+                                 ('group'));
+}
+
+sub new {
+    my $ref = Apache::lonhelper::choices->new();
+    bless($ref);
+}
+ 
+sub start_group {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ 
+    if ($target ne 'helper') {
+        return '';
+    }
+
+    $paramHash->{CHOICES} = [];
+
+    $paramHash->{'variable'} = $token->[2]{'variable'};
+    $helper->declareVar($paramHash->{'variable'});
+    $paramHash->{'multichoice'} = $token->[2]{'multichoice'};
+    $paramHash->{'allowempty'} = $token->[2]{'allowempty'};
+    if (defined($token->[2]{'nextstate'})) {
+        $paramHash->{NEXTSTATE} = $token->[2]{'nextstate'};
+    }
+
+    # Populate the CHOICES element
+    my %choices;
+
+    my %curr_groups;
+    if (&Apache::loncommon::coursegroups(\%curr_groups)) {
+	foreach my $group_name (sort(keys(%curr_groups))) {
+	    push(@{$paramHash->{CHOICES}}, [$group_name, $group_name]);
+	}
+    }
+}
+
+sub end_group {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+
+    if ($target ne 'helper') {
+        return '';
+    }
+    Apache::lonhelper::group->new();
+}
+1;
+
 package Apache::lonhelper::string;
 
 =pod
@@ -3314,8 +3521,11 @@ sub render {
     }
     my $previous = HTML::Entities::encode(&mt("<- Previous"), '<>&"');
     my $next = HTML::Entities::encode(&mt("Next ->"), '<>&"');
+    my $target = " target='loncapaclient'";
+    if (($env{'browser.interface'} eq 'textual') ||
+        ($env{'environment.remote'} eq 'off')) {  $target='';  }
     $result .= "<center>\n" .
-	"<form action='".$actionURL."' method='post' target='loncapaclient'>\n" .
+	"<form action='".$actionURL."' method='post' $target>\n" .
 	"<input type='button' onclick='history.go(-1)' value='$previous' />" .
 	"<input type='hidden' name='orgurl' value='$targetURL' />" .
 	"<input type='hidden' name='selectrole' value='1' />\n" .
@@ -3516,6 +3726,11 @@ sub render {
         $result .= '<li>'.&mt('for section [_1]',"<b>$section</b>").'</li>';
 	$result .= "<input type='hidden' name='csec' value='" .
             HTML::Entities::encode($section,"'<>&\"") . "' />\n";
+    } elsif ($vars->{TARGETS} eq 'group') {
+        my $group = $vars->{GROUP_NAME};
+        $result .= '<li>'.&mt('for group [_1]',"<b>$group</b>").'</li>';
+        $result .= "<input type='hidden' name='cgroup' value='" .
+            HTML::Entities::encode($group,"'<>&\"") . "' />\n";
     } else {
         # FIXME: This is probably wasteful! Store the name!
         my $classlist = Apache::loncoursedata::get_classlist();
