loncom/interface/loncoursegroups.pm - diff

Return to loncoursegroups.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/loncoursegroups.pm between versions 1.59 and 1.60

version 1.59, 2006/07/29 00:31:58	version 1.60, 2006/08/17 23:36:05
Line 127 sub print_main_menu {	Line 127 sub print_main_menu {
function changeSort(caller) {	function changeSort(caller) {
document.$state.sortby.value = caller;	document.$state.sortby.value = caller;
document.$state.submit();	document.$state.submit();
	}
	function openGroupRoster(group,status) {
	var url = '/adm/grouproster?';
	url += 'group='+group+'&status='+status+'&ref=popup';
	var title = 'Group Membership';
	var options = 'scrollbars=1,resizable=1,menubar=0';
	options += ',width=700,height=600';
	rosterbrowser = open(url,title,options,'1');
	rosterbrowser.focus();
}\n\|;	}\n\|;
$r->print(&header('Groups',$jscript,$action,$state));	$r->print(&header('Groups',$jscript,$action,$state));
if ($env{'form.refpage'} eq 'enrl') {	if ($env{'form.refpage'} eq 'enrl') {
Line 1151 sub group_members {	Line 1160 sub group_members {
my ($cdom,$cnum,$group,$group_info) = @_;	my ($cdom,$cnum,$group,$group_info) = @_;
my %memberhash = &Apache::lonnet::get_group_membership($cdom,$cnum,$group);	my %memberhash = &Apache::lonnet::get_group_membership($cdom,$cnum,$group);
my $now = time;	my $now = time;
my ($tmp)=keys(%memberhash);	my %lt = &Apache::lonlocal::texthash (
if ($tmp=~/^error:/) {	active => 'active',
$$group_info{'totalmembers'} = 'Unknown - an error occurred';	previous => 'previous',
return $tmp;	future => 'future',
}	);
	my %membercounts = (
	active => 0,
	previous => 0,
	future => 0,
	);
my $totalmembers = 0;	my $totalmembers = 0;
my $active = 0;
my $previous = 0;
my $future = 0;
foreach my $member (keys %memberhash) {	foreach my $member (keys %memberhash) {
$totalmembers ++;	$totalmembers ++;
my ($end,$start) = split(/:/,$memberhash{$member});	my ($end,$start) = split(/:/,$memberhash{$member});
unless ($start == -1) {	unless ($start == -1) {
if (($end!=0) && ($end<$now)) {	if (($end!=0) && ($end<$now)) {
$previous ++;	$membercounts{previous} ++;
} elsif (($start!=0) && ($start>$now)) {	} elsif (($start!=0) && ($start>$now)) {
$future ++;	$membercounts{future} ++;
} else {	} else {
$active ++;	$membercounts{active} ++;
}	}
}	}
}	}
if ($totalmembers == 0) {	if ($totalmembers == 0) {
$$group_info{$group}{'totalmembers'} = 'None';	$$group_info{$group}{'totalmembers'} = 'None';
} else {	} else {
$$group_info{$group}{'totalmembers'} = '<nobr>'.$active.	foreach my $type ('active','previous','future') {
' - active</nobr><br /><nobr>'.$previous.	$$group_info{$group}{'totalmembers'} .=
' - previous</nobr><br /><nobr>'.$future.	&open_list_window($group,$type,$membercounts{$type},$lt{$type});
' - future</nobr>';	}
}	}
return 'ok';	return 'ok';
}	}

	sub open_list_window {
	my ($group,$status,$count,$text) = @_;
	my $entry;
	if ($count > 0) {
	$entry = '<nobr><a href="javascript:openGroupRoster('.
	"'$group','$status'".')">'.$text.'</a> - '.$count.
	'</nobr><br />';
	} else {
	$entry = '<nobr>'.$text.' - '.$count.'</nobr><br />';
	}
	return $entry;
	}


sub general_settings_form {	sub general_settings_form {
my ($r,$cdom,$cnum,$action,$formname,$page,$functions,$tools,	my ($r,$cdom,$cnum,$action,$formname,$page,$functions,$tools,

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.59
changed lines
	Added in v.1.60