--- loncom/interface/lonhelper.pm 2006/05/09 18:15:39 1.143 +++ loncom/interface/lonhelper.pm 2006/05/09 21:39:47 1.144 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # .helper XML handler to implement the LON-CAPA helper # -# $Id: lonhelper.pm,v 1.143 2006/05/09 18:15:39 albertel Exp $ +# $Id: lonhelper.pm,v 1.144 2006/05/09 21:39:47 foxr Exp $ # # Copyright Michigan State University Board of Trustees # @@ -2291,14 +2291,16 @@ use Apache::lonnet; # set of students won't collide. # $defaultusers - reference to a hash containng # the set of users that should be on or off. +# $multiselect - True if multiselect allowed. +# $resultname - Name of result variable. # Returns: # HTML text to add to the rendering of the helper. # sub render_student_list { - my ($self, - $sections, $students, $formprefix, $defaultusers) = @_; + my ( + $sections, $students, $formprefix, $defaultusers, + $multiselect, $resultname) = @_; - my $multiselect = $self->{'multichoice'}; my $result = ""; # If multiple selections are allowed, we have a listbox @@ -2352,7 +2354,7 @@ sub render_student_list { my $checked = 0; for my $student (@$students) { $result .= '[0]; # Figure out which students are checked by default... @@ -2362,7 +2364,7 @@ sub render_student_list { $result .= ' checked ="checked" '; $checked = 1; } - } elsif (!$self->{'multichoice'} && !$checked) { + } elsif (!$multiselect && !$checked) { $result .= ' checked="checked" '; $checked = 1; # First one for radio if no default specified. } @@ -2697,10 +2699,12 @@ BUTTONS # Current personel - $result .= $self->render_student_list(\%sections, + $result .= &render_student_list(\%sections, $current_members, "current", - \%defaultUsers); + \%defaultUsers, + $self->{'multichoice'}, + $self->{'variable'}); # If activeonly is not set then we can also give the expired students: @@ -2709,16 +2713,20 @@ BUTTONS # And future. - $result .= $self->render_student_list(\%sections, + $result .= &render_student_list(\%sections, $future_members, "future", - \%defaultUsers); + \%defaultUsers, + $self->{'multichoice'}, + $self->{'variable'}); # Past - $result .= $self->render_student_list(\%sections, + $result .= &render_student_list(\%sections, $expired_members, "past", - \%defaultUsers); + \%defaultUsers, + $self->{'multichoice'}, + $self->{'variable'}); }