--- loncom/interface/lonselstudent.pm 2006/05/11 21:10:21 1.1
+++ loncom/interface/lonselstudent.pm 2006/05/23 21:41:26 1.7
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# lonselstudent.pm : Reusable subs for student selection.
#
-# $Id: lonselstudent.pm,v 1.1 2006/05/11 21:10:21 foxr Exp $
+# $Id: lonselstudent.pm,v 1.7 2006/05/23 21:41:26 foxr Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -36,7 +36,14 @@ use HTML::Entities;
# This function produces a list references to four
# arrays:
# (\@course_personel, \@current_members, \@expired_members, \@future_members)
-#
+#
+#
+# Parameters;
+#
+# restrict - Optional.. if present and defined should be a section name.
+# The *_members arrays will then only contain people
+# in that section
+#
# Where:
# course_personnel - Each element of this array is itself a reference to an array
# containing information about a member of the course staff.
@@ -66,25 +73,25 @@ use HTML::Entities;
# [4] username:domain of the user.
#
sub get_people_in_class {
+ my ($section_restriction) = @_;
my %coursepersonnel = &Apache::lonnet::get_course_adv_roles();
#
# Enumerate the course_personnel.
#
my @course_personnel;
- for (sort keys %coursepersonnel) {
- for my $role (split /,/, $coursepersonnel{$_}) {
- # extract the names so we can sort them
- my @people;
-
- for (split /,/, $role) {
- push @people, [split /:/, $role];
- }
-
- @people = sort { $a->[0] cmp $b->[0] } @people;
+ for my $role (sort(keys(%coursepersonnel))) {
+ # extract the names so we can sort them
+ my @people;
+ for my $person (split(/,/, $coursepersonnel{$role})) {
+ my ($uname,$domain) = split(/:/, $person);
+ push(@people, [&Apache::loncommon::plainname($uname,$domain),
+ $uname,$domain]);
+ }
+ @people = sort { $a->[0] cmp $b->[0] } (@people);
- for my $person (@people) {
- push @course_personnel, [join(':', @$person), $person->[0], '', $_];
- }
+ for my $person (@people) {
+ push(@course_personnel, [join(':', $person->[1],$person->[2]),
+ $person->[0], '', '', $role]);
}
}
# Students must be split into the three categories:
@@ -102,41 +109,45 @@ sub get_people_in_class {
my $classlist = &Apache::loncoursedata::get_classlist();
- my @keys = keys %{$classlist};
+ my @keys = keys(%{$classlist});
# Sort by: Section, name
@keys = sort {
if ($classlist->{$a}->[$section] ne $classlist->{$b}->[$section]) {
return $classlist->{$a}->[$section] cmp $classlist->{$b}->[$section];
}
return $classlist->{$a}->[$fullname] cmp $classlist->{$b}->[$fullname];
- } @keys;
+ } (@keys);
- for (@keys) {
-
- if ( $classlist->{$_}->[$status] eq
- 'Active') {
- push @current_members, [$_, $classlist->{$_}->[$fullname],
- $classlist->{$_}->[$section],
- $classlist->{$_}->[$status], 'Student'];
- } else {
- # Need to figure out if this user is future or
- # Expired... If the start date is in the future
- # the user is future...else expired.
+ for my $user (@keys) {
+ if (!$section_restriction ||
+ ($section_restriction eq $classlist->{$user}->[$section])) {
- my $now = time;
- if ($classlist->{$_}->[$start_date] > $now) {
- push @future_members, [$_, $classlist->{$_}->[$fullname],
- $classlist->{$_}->[$section],
- "Future", "Student"];
+ if ( $classlist->{$user}->[$status] eq
+ 'Active') {
+ push(@current_members, [$user, $classlist->{$user}->[$fullname],
+ $classlist->{$user}->[$section],
+ $classlist->{$user}->[$status], 'Student']);
} else {
- push @expired_members, [$_, $classlist->{$_}->[$fullname],
- $classlist->{$_}->[$section],
- "Expired", "Student"];
+ # Need to figure out if this user is future or
+ # Expired... If the start date is in the future
+ # the user is future...else expired.
+
+ my $now = time;
+ if ($classlist->{$user}->[$start_date] > $now) {
+ push(@future_members, [$user, $classlist->{$user}->[$fullname],
+ $classlist->{$user}->[$section],
+ "Future", "Student"]);
+ } else {
+ push(@expired_members, [$user,
+ $classlist->{$user}->[$fullname],
+ $classlist->{$user}->[$section],
+ "Expired", "Student"]);
+ }
+
}
-
}
}
return (\@course_personnel,
@@ -155,6 +166,7 @@ sub get_people_in_class {
# Parameters:
# $students - Students in the section. (ref to array of references
# to arrays).
+# $formname - Name of the form in which this stuff gets rendered.
# $formprefix - form path prefix for form element names
# This is used to make each form element
# so that the segments having to do with each
@@ -171,7 +183,7 @@ sub get_people_in_class {
# HTML text to add to the rendering of the helper.
#
sub render_student_list {
- my ($students, $formprefix, $defaultusers,
+ my ($students, $formname, $formprefix, $defaultusers,
$multiselect, $resultname, $javascript) = @_;
my $result = "";
@@ -184,8 +196,8 @@ sub render_student_list {
function findElement(name) {
var i;
var ele;
- for(i =0; i < document.forms.helpform.elements.length; i++) {
- ele = document.forms.helpform.elements[i];
+ for(i =0; i < document.forms.$formname.elements.length; i++) {
+ ele = document.forms.$formname.elements[i];
if(ele.name == name) {
return ele;
}
@@ -219,8 +231,8 @@ sub render_student_list {
function setAllStudents(value, which) {
var i;
var ele;
- for (i =0; i < document.forms.helpform.elements.length; i++) {
- ele = document.forms.helpform.elements[i];
+ for (i =0; i < document.forms.$formname.elements.length; i++) {
+ ele = document.forms.$formname.elements[i];
if(isStudent(ele) && rightSubForm(ele, which)) {
ele.checked=value;
}
@@ -229,8 +241,8 @@ sub render_student_list {
function setAllCoursePersonnel(value, which) {
var i;
var ele;
- for (i =0; i < document.forms.helpform.elements.length; i++) {
- ele = document.forms.helpform.elements[i];
+ for (i =0; i < document.forms.$formname.elements.length; i++) {
+ ele = document.forms.$formname.elements[i];
if(!isStudent(ele) && rightSubForm(ele, which)) {
ele.checked = value;
}
@@ -239,8 +251,8 @@ sub render_student_list {
function setSection(which, value, subform) {
var i;
var ele;
- for (i =0; i < document.forms.helpform.elements.length; i++) {
- ele = document.forms.helpform.elements[i];
+ for (i =0; i < document.forms.$formname.elements.length; i++) {
+ ele = document.forms.$formname.elements[i];
if (ele.value.indexOf(':') != -1) {
if ((section(ele) == which) && rightSubForm(ele, subform)) {
ele.checked = value;
@@ -329,12 +341,14 @@ SCRIPT
# True -> checkboxes.
# False -> radiobuttons.
- $result .= "