--- loncom/interface/lonpickstudent.pm 2007/07/21 00:48:55 1.21 +++ loncom/interface/lonpickstudent.pm 2011/01/23 01:04:26 1.29 @@ -1,7 +1,7 @@ # The LearningOnline Network # Pick a student from the classlist # -# $Id: lonpickstudent.pm,v 1.21 2007/07/21 00:48:55 albertel Exp $ +# $Id: lonpickstudent.pm,v 1.29 2011/01/23 01:04:26 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -50,7 +50,7 @@ sub handler { &Apache::loncommon::get_unprocessed_cgi ($ENV{'QUERY_STRING'},['filter','form','unameelement','udomelement', - 'roles']); + 'roles','courseadvonly','clicker']); # Allowed? my $allowed; my $scope = $env{'request.course.id'}; @@ -70,41 +70,35 @@ sub handler { # See if filter present my $filter=$env{'form.filter'}; my $filtermsg; - if ($filter eq '') { - $filter = '.' - } else { - my $encoded_filter = &HTML::Entities::encode($filter,'<>&"'); - $filter = quotemeta($filter); - my $change = &mt('Change'); - my $filterbutton =<&"'); + $filter = quotemeta($filter); + my $change = &mt('Change'); + my $filterbutton =< FILTER - foreach my $name ('form','unameelement','udomelement','roles') { - my $value = &HTML::Entities::encode($env{"form.$name"},'<>&"'); - $filterbutton .= <&"'); + $filterbutton .= < HIDDEN - } + } + unless ($env{'form.courseadvonly'}) { $filtermsg = '
'. &mt('Showing users with a name starting with [_1]', - $filterbutton).'
'; + $filterbutton).'
'; + } + if ($filter eq '') { + $filter = '.' } - - my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; - my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; - my $classlist=&Apache::loncoursedata::get_classlist(); - my %grouplist=&Apache::lonnet::get_group_membership($cdom,$cnum); - my $now = time; - my %allgroups = &Apache::longroup::coursegroups($cdom,$cnum); # --------------------------------------- There is such a user, get environment $r->print(< function gochoose(uname,udom) { - opener.document.$env{'form.form'}.$env{'form.unameelement'}.value=uname; - var slct=opener.document.$env{'form.form'}.$env{'form.udomelement'}; + opener.document.$env{'form.form'}.elements['$env{'form.unameelement'}'].value=uname; + var slct=opener.document.$env{'form.form'}.elements['$env{'form.udomelement'}']; var i; for (i=0;iprint(&Apache::loncommon::start_data_table()); foreach my $role (sort(keys(%coursepersonnel))) { - foreach (split(/\,/,$coursepersonnel{$role})) { - my ($puname,$pudom)=split(/\:/,$_); - $role = &Apache::lonnet::plaintext($role, - &Apache::loncommon::course_type()); + foreach my $user (split(/\,/,$coursepersonnel{$role})) { + my ($puname,$pudom)=split(/\:/,$user); $r->print(&Apache::loncommon::start_data_table_row(). ''. - ''.$role.''. &Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($puname,$pudom),$puname,$pudom).''. &Apache::loncommon::end_data_table_row()); @@ -139,56 +131,107 @@ ENDSCRIPT $r->print($filtermsg); - $r->print('

'. - &Apache::loncommon::start_data_table(). - &Apache::loncommon::start_data_table_header_row(). - &Apache::loncommon::end_data_table_header_row(). - ' '. - ''.&mt('username').''. - ''.&mt('domain').''. - ''.&mt('Name').''. - ''.&mt('ID').''. - ''.&mt('section').''. - ''.&mt('active group(s)').''. - &Apache::loncommon::end_data_table_header_row()); + $r->print('

'); + + unless ($env{'form.courseadvonly'}) { + # ------------------------------------------------------------------ Students - foreach my $user (sort(keys(%$classlist))) { - # the following undefs are for 'domain', and 'username' respectively. - my (undef,undef,$end,$start,$id,$section,$fullname,$status)= - @{$classlist->{$user}}; - if ($allowed eq 'section' && $section ne $env{'request.course.sec'}) { - next; - } - if ($user=~/^($LONCAPA::username_re)\:($LONCAPA::domain_re)$/) { - my ($uname,$udom)=($1,$2); - if (($uname=~/^$filter/) || - ($fullname=~/^$filter/i)) { - my $grouplist = ''; - foreach my $group (sort(keys(%allgroups))) { - if (exists($grouplist{$group.':'.$uname.':'.$udom})) { - my ($end,$start) = split(/:/,$grouplist{$group.':'.$uname.':'.$udom}); - if (($end!=0) && ($end<$now)) { next; } - if (($start!=0) && ($start>$now)) {next; } - $grouplist .= " $group,"; - } + +# Do we have a clicker? + + my $clicker=$env{'form.clicker'}; + my @fragments=(); + if ($clicker) { + $r->print('

'.&mt('Clicker: [_1]',$clicker).'

'); + my $clicklength=length($clicker); + my $maxlength=$clicklength-1; + if ($maxlength>2) { + my $minlength=$maxlength-2; + if ($minlength<2) { $minlength=2; } + for (my $length=$maxlength;$length>=$minlength;$length--) { + for (my $startidx=0; $startidx<=$clicklength-$length; $startidx++) { + push(@fragments,substr($clicker,$startidx,$length)); + } + } + } + } + + my $result; + my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; + my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; + my $classlist=&Apache::loncoursedata::get_classlist(); + my %grouplist=&Apache::lonnet::get_group_membership($cdom,$cnum); + my $now = time; + my %allgroups = &Apache::longroup::coursegroups($cdom,$cnum); + + foreach my $user (sort(keys(%$classlist))) { + # the following undefs are for 'domain', and 'username' respectively. + my (undef,undef,$end,$start,$id,$section,$fullname,$status)= + @{$classlist->{$user}}; + if ($allowed eq 'section' && $section ne $env{'request.course.sec'}) { + next; + } + if ($user=~/^($LONCAPA::username_re)\:($LONCAPA::domain_re)$/) { + my ($uname,$udom)=($1,$2); + if (($uname=~/^$filter/) || ($fullname=~/^$filter/i)) { + my $grouplist = ''; + foreach my $group (sort(keys(%allgroups))) { + if (exists($grouplist{$group.':'.$uname.':'.$udom})) { + my ($end,$start) = split(/:/,$grouplist{$group.':'.$uname.':'.$udom}); + if (($end!=0) && ($end<$now)) { next; } + if (($start!=0) && ($start>$now)) {next; } + $grouplist .= " $group,"; + } + } + $grouplist =~ s/,$//; + my $markedupclicker; + if ($clicker) { + $markedupclicker=(&Apache::lonnet::userenvironment($udom,$uname,'clickers'))[1]; + if ($markedupclicker!~/\w/) { + $markedupclicker='-'; + } else { + foreach my $frag (@fragments) { + if ($markedupclicker=~/\Q$frag\E/is) { + $markedupclicker=~s/(\Q$frag\E)/$1<\/b><\/font>/gis; + last; + } + } + } + } + $result .=&Apache::loncommon::start_data_table_row(). + ''. + ''. + ''.$uname.' '.$udom. + ''. + &Apache::loncommon::aboutmewrapper($fullname, + $uname,$udom). + ''.$id.''.$section. + ''.$grouplist.''. + ($clicker?''.$markedupclicker.'':''). + &Apache::loncommon::end_data_table_row(); } - $grouplist =~ s/,$//; - $r->print(&Apache::loncommon::start_data_table_row(). - ''. - ''. - ''.$uname.' '.$udom. - ''. - &Apache::loncommon::aboutmewrapper($fullname, - $uname,$udom). - ''.$id.''.$section. - ''.$grouplist.''. - &Apache::loncommon::end_data_table_row()); - } + } } - } - - $r->print(&Apache::loncommon::end_data_table().'

'); + if (!$result) { + $r->print('

'.&mt('No students found.').'

'); + } else { + $r->print(&Apache::loncommon::start_data_table(). + &Apache::loncommon::start_data_table_header_row(). + &Apache::loncommon::end_data_table_header_row(). + ' '. + ''.&mt('username').''. + ''.&mt('domain').''. + ''.&mt('Name').''. + ''.&mt('ID').''. + ''.&mt('section').''. + ''.&mt('active group(s)').''. + ($clicker?''.&mt('clicker').'':''). + &Apache::loncommon::end_data_table_header_row(). + $result. + &Apache::loncommon::end_data_table()); + } + } } else { $r->print('

'.&mt('Users with Roles Assigned by').' '. &Apache::loncommon::plainname($env{'user.name'}, @@ -196,28 +239,35 @@ ENDSCRIPT $r->print($filtermsg); $r->print('

'.&Apache::loncommon::start_data_table()); - my %users=&Apache::lonnet::get_my_roles(); - foreach my $user (sort(keys(%users))) { - if ($user =~ - /^($LONCAPA::username_re)\:($LONCAPA::domain_re)\:(\w+)$/) { - my ($uname,$udom,$urole)=($1,$2,$3); - my $fullname=&Apache::loncommon::plainname($uname,$udom); - if (($uname=~/^$filter/) || - ($fullname=~/^$filter/i)) { - $r->print(&Apache::loncommon::start_data_table_row(). - ''. - ''. - ''.$uname.''.$udom. - ''. - &Apache::loncommon::aboutmewrapper( - $fullname, - $uname,$udom).''. - &Apache::lonnet::plaintext($urole). - ''. - &Apache::loncommon::end_data_table_row()); - } + my %user_role=&Apache::lonnet::get_my_roles(); + my %users; + foreach my $user_role (keys(%user_role)) { + next if ($user_role !~ + /^($LONCAPA::username_re):($LONCAPA::domain_re):(\w+)$/); + my ($uname,$udom,$urole)=($1,$2,$3); + my $fullname=&Apache::loncommon::plainname($uname,$udom); + next if (($uname!~/^$filter/i) && ($fullname !~/^$filter/i)); + + if (!exists($users{"$uname:$udom"})) { + $users{"$uname:$udom"} = {'fullname' => $fullname }; } + push(@{$users{"$uname:$udom"}{'roles'}},$urole); + } + foreach my $user (sort {lc($a) cmp lc($b)} (keys(%users))) { + my ($uname,$udom) = split(':',$user); + $r->print(&Apache::loncommon::start_data_table_row(). + ''. + ''. + ''.$uname.''. + ''.$udom.''. + &Apache::loncommon::aboutmewrapper($users{$user}{'fullname'}, + $uname,$udom).''. + ''. + join(', ',sort(map {&Apache::lonnet::plaintext($_)} + (@{$users{$user}{'roles'}}))). + ''. + &Apache::loncommon::end_data_table_row()); } $r->print(&Apache::loncommon::end_data_table().'

'); }