--- loncom/interface/lonpickstudent.pm 2007/08/10 23:20:09 1.23
+++ loncom/interface/lonpickstudent.pm 2013/07/15 16:13:22 1.32
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Pick a student from the classlist
#
-# $Id: lonpickstudent.pm,v 1.23 2007/08/10 23:20:09 albertel Exp $
+# $Id: lonpickstudent.pm,v 1.32 2013/07/15 16:13:22 bisitz 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'};
@@ -83,27 +83,22 @@ FILTER
HIDDEN
}
- $filtermsg = ' '.
- &mt('Showing users with a name starting with [_1]',
- $filterbutton).' ';
+ unless ($env{'form.courseadvonly'}) {
+ $filtermsg = ' '.
+ &mt('Showing users with a name starting with [_1]',
+ $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;i
ENDSCRIPT
- $r->print('
');
+ $r->rflush();
+
+ unless ($env{'form.courseadvonly'}) {
+
# ------------------------------------------------------------------ Students
- my $result;
- 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().
+ '