--- loncom/interface/lonpickstudent.pm	2006/03/16 21:53:17	1.14
+++ 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.14 2006/03/16 21:53:17 raeburn Exp $
+# $Id: lonpickstudent.pm,v 1.32 2013/07/15 16:13:22 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -34,6 +34,8 @@ use Apache::loncommon;
 use Apache::loncoursedata;
 use Apache::lonnet;
 use Apache::lonlocal;
+use Apache::longroup;
+use LONCAPA;
 
 sub handler {
     my $r = shift;
@@ -48,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'};
@@ -66,26 +68,37 @@ sub handler {
     }
 
 # See if filter present
-
     my $filter=$env{'form.filter'};
-    $filter=~s/\W//g;
-    unless ($filter) { $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::loncommon::coursegroups(\%allgroups,$cdom,$cnum);
+    my $filtermsg;
+    my $encoded_filter = &HTML::Entities::encode($filter,'<>&"');
+    $filter = quotemeta($filter);
+    my $change = &mt('Change');
+    my $filterbutton =<<FILTER;
+  <input type="text" name="filter" value="$encoded_filter" />
+  <input type="submit" name="Change" value="$change" />
+FILTER
+    foreach my $name ('form','unameelement','udomelement','roles') {
+	my $value = &HTML::Entities::encode($env{"form.$name"},'<>&"');
+	$filterbutton .= <<HIDDEN;
+   <input type="hidden" name="$name" value="$value" />
+HIDDEN
+    }
+    unless ($env{'form.courseadvonly'}) {
+        $filtermsg = '<br />'.
+	    &mt('Showing users with a name starting with [_1]',
+	        $filterbutton).'<br />';
+    }
+    if ($filter eq '') {
+	$filter = '.'
+    }
 
 # --------------------------------------- There is such a user, get environment
 
     $r->print(<<ENDSCRIPT);
-<script>
+<script type="text/javascript">
 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<slct.length;i++) {
         if (slct.options[i].value==udom) { slct.selectedIndex=i; }
@@ -94,99 +107,175 @@ function gochoose(uname,udom) {
 }
 </script>
 ENDSCRIPT
-    
-  $r->print('<form>');
-  if ($allowed && (!$env{'form.roles'})) {
+
+    $r->print('<form action="">');
+    if ($allowed && (!$env{'form.roles'})) {
 # -------------------------------------------------------- Get course personnel
-    $r->print('<h3>'.$env{'course.'.$env{'request.course.id'}.'.description'}.
-              '</h3>');
-    my %coursepersonnel=
-       &Apache::lonnet::get_course_adv_roles();
-    $r->print('<table border="2">');
-    foreach my $role (sort keys %coursepersonnel) {
-       foreach (split(/\,/,$coursepersonnel{$role})) {
-	   my ($puname,$pudom)=split(/\:/,$_);
-	   $r->print('<tr><td>'.
-             '<input type="button" value="Select" onClick="gochoose('.
-             "'".$puname."','".$pudom."')".'" /></td><td>'.$role.'</td><td>'.
-		     &Apache::loncommon::aboutmewrapper(
-                          &Apache::loncommon::plainname($puname,
-                          $pudom),$puname,$pudom).'</td></tr>');
-	}
-    }
-    $r->print('</table><p>&nbsp;');
-    if ($filter ne '.') {
-       $r->print('<br/ >'.&mt('Name starting with').' "'.$filter.'"<br />');
-    }
-    $r->print('</p><p><table><tr><th>&nbsp;</th><th>username</th><th>domain</th><th>Name</th><th>ID</th><th>section</th><th>active group(s)</th>');
-  # ------------------------------------------------------------------ Students
-    foreach (sort keys %$classlist) {
-        # the following undefs are for 'domain', and 'username' respectively.
-	my (undef,undef,$end,$start,$id,$section,$fullname,$status)=
-            @{$classlist->{$_}};
-	if ($allowed eq 'section' && $section ne $env{'request.course.sec'}) {
-	    next;
+	$r->print('<h3>'.$env{'course.'.$env{'request.course.id'}.'.description'}.
+		  '</h3>');
+	my %coursepersonnel=
+	    &Apache::lonnet::get_course_adv_roles();
+	$r->print(&Apache::loncommon::start_data_table());
+	foreach my $role (sort(keys(%coursepersonnel))) {
+	    foreach my $user (split(/\,/,$coursepersonnel{$role})) {
+		my ($puname,$pudom)=split(/\:/,$user);
+		$r->print(&Apache::loncommon::start_data_table_row().
+			  '<td>'.
+			  '<input type="button" value="'.&mt('Select').'" onclick="gochoose('.
+			  "'".$puname."','".$pudom."')".'" /></td><td>'.$role.'</td><td>'.
+			  &Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($puname,$pudom),$puname,$pudom).'</td>'.
+			  &Apache::loncommon::end_data_table_row());
+	    }
 	}
-        if ($_=~/^(\w+)\:(\w+)$/) {
-	    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,"; 
-                   }
+	$r->print(&Apache::loncommon::end_data_table().'<p>&nbsp;');
+
+	$r->print($filtermsg);
+
+	$r->print('</p>');
+
+        $r->rflush();
+
+        unless ($env{'form.courseadvonly'}) {
+
+# ------------------------------------------------------------------ Students
+
+# Do we have a clicker?
+
+            my $clicker=$env{'form.clicker'};
+            my @fragments=();
+            if ($clicker) {
+               $r->print('<h1>'.&mt('Clicker: [_1]',$clicker).'</h1>');
+               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));
+                      }
+                  }
                }
-               $grouplist =~ s/,$//;
-	       $r->print('<tr><td>'.
-                      '<input type="button" value="'.&mt('Select').'" onClick="gochoose('.
-                      "'".$uname."','".$udom."')".'" /></td>'.
-                         '<td><tt>'.$uname.'</tt></td><td> <tt>'.$udom.
-                         '</tt></td><td>'.
-                         &Apache::loncommon::aboutmewrapper(
-                         $fullname,
-                         $uname,$udom).'</td><td>'.$id.'</td><td>'.$section.
-                                       '</td><td>'.$grouplist.'</td></tr>');
-	   }
-        }
-    }
+            }
 
-    $r->print('</table></p>');
-  } else {
-    $r->print('<h3>'.&mt('Users with Roles Assigned by').' '.
-	      &Apache::loncommon::plainname($env{'user.name'},
-					    $env{'user.domain'}).'</h3>');
-    if ($filter ne '.') {
-       $r->print('<br/ >'.&mt('Name starting with').' "'.$filter.'"<br />');
-    }
-    $r->print('<p><table>');
-    my %users=&Apache::lonnet::get_my_roles();
-    foreach (sort keys %users) {
-        if ($_=~/^(\w+)\:(\w+)\:(\w+)$/) {
+	    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)/<font color=\"green\" size=\"\+1\"><b>$1<\/b><\/font>/gis;
+                                     last;
+                                  }
+                               }
+                           }
+                        }
+		        $result .=&Apache::loncommon::start_data_table_row().
+		    	          '<td>'.
+			          '<input type="button" value="'.&mt('Select').'" onclick="gochoose('.
+			          "'".$uname."','".$udom."')".'" /></td>'.
+			          '<td><tt>'.$uname.'</tt></td><td> <tt>'.$udom.
+			          '</tt></td><td>'.
+			          &Apache::loncommon::aboutmewrapper($fullname,
+				    				     $uname,$udom).
+			          '</td><td>'.$id.'</td><td>'.$section.
+			          '</td><td>'.$grouplist.'</td>'.
+                                  ($clicker?'<td>'.$markedupclicker.'</td>':'').
+			          &Apache::loncommon::end_data_table_row();
+		    }
+	        }
+	    }
+	    if (!$result) {
+	        $r->print('<p>'.&mt('No students found.').'</p>');
+	    } else {
+	        $r->print(&Apache::loncommon::start_data_table().
+	    	          &Apache::loncommon::start_data_table_header_row().
+		          &Apache::loncommon::end_data_table_header_row().
+		          '<th>&nbsp;</th>'.
+		          '<th>'.&mt('username').'</th>'.
+		          '<th>'.&mt('domain').'</th>'.
+		          '<th>'.&mt('Name').'</th>'.
+		          '<th>'.&mt('ID').'</th>'.
+		          '<th>'.&mt('section').'</th>'.
+		          '<th>'.&mt('active group(s)').'</th>'.
+                          ($clicker?'<th>'.&mt('clicker').'</th>':'').
+		          &Apache::loncommon::end_data_table_header_row().
+		          $result.
+		          &Apache::loncommon::end_data_table());
+	    }
+        }
+    } else {
+	$r->print('<h3>'.&mt('Users with Roles Assigned by').' '.
+		  &Apache::loncommon::plainname($env{'user.name'},
+						$env{'user.domain'}).'</h3>');
+	$r->print($filtermsg);
+        $r->rflush();
+
+	$r->print('<p>'.&Apache::loncommon::start_data_table());
+	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);
-	    if (($uname=~/^$filter/) || 
-                ($fullname=~/^$filter/i)) {
-	       $r->print('<tr><td>'.
-                      '<input type="button" value="Select" onClick="gochoose('.
-                      "'".$uname."','".$udom."')".'" /></td>'.
-                         '<td><tt>'.$uname.'</tt></td><td><tt>'.$udom.
-                         '</tt></td><td>'.
-                         &Apache::loncommon::aboutmewrapper(
-                         $fullname,
-                         $uname,$udom).'</td><td><td>'.
-			 &Apache::lonnet::plaintext($urole).
-                                       '</td></tr>');
-	   }
-        }
+	    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().
+		      '<td>'.
+		      '<input type="button" value="'.&mt('Select').'" onclick="gochoose('.
+		      "'".$uname."','".$udom."')".'" /></td>'.
+		      '<td><tt>'.$uname.'</tt></td>'.
+		      '<td><tt>'.$udom.'</tt></td><td>'.
+		      &Apache::loncommon::aboutmewrapper($users{$user}{'fullname'},
+							 $uname,$udom).'</td>'.
+		      '<td>'.
+		      join(', ',sort(map {&Apache::lonnet::plaintext($_)}
+				         (@{$users{$user}{'roles'}}))).
+		      '</td>'.
+		      &Apache::loncommon::end_data_table_row());
+	}
+	$r->print(&Apache::loncommon::end_data_table().'</p>');
     }
-    $r->print('</table></p>');
-  }
-  $r->print('</form>'.&Apache::loncommon::end_page());
-  return OK;
+    $r->print('</form>'.&Apache::loncommon::end_page());
+    return OK;
 } 
 
 1;