Student manual enrolment now allows enter to submit search and

autofocusses search input

diff --git a/course/student.html b/course/student.html
index a4aee5480a15d4e3afc416e29e3bc075b8623692..c8dec7562bf8af4458d3d24778263117bd9d3826 100644 (file)
--- a/course/student.html
+++ b/course/student.html
@@ -1,14 +1,15 @@
 
 <form name="studentform" id="studentform" method="post" action="student.php">
+<input type="hidden" name="previoussearch" value="<?php echo $previoussearch ?>">
 <input type="hidden" name="id" value="<?php echo $id?>">
   <table align="center" border="0" cellpadding="5" cellspacing="0">
     <tr>
       <td valign="top">
-          <?php p($strexistingstudents) ?>
+          <?php echo count($students) . " ". $strexistingstudents ?>
       </td>
       <td></td>
       <td valign="top">
-          <?php p($strpotentialstudents) ?>
+          <?php echo $usercount . " " . $strpotentialstudents ?>
       </td>
     </tr>
     <tr>
@@ -57,7 +58,12 @@
                   onFocus ="document.studentform.add.disabled=true;
                             document.studentform.remove.disabled=true;
                             document.studentform.removeselect.selectedIndex=-1;
-                            document.studentform.addselect.selectedIndex=-1;">
+                            document.studentform.addselect.selectedIndex=-1;"
+                  onkeydown = "var keyCode = event.which ? event.which : event.keyCode;
+                               if (keyCode == 13) {
+                                    document.studentform.previoussearch.value=1;
+                                    document.studentform.submit();
+                               } " />
          <input name="search" id="search" type="submit" value="<?php p($strsearch) ?>" />
          <?php
               if (!empty($searchusers)) {

diff --git a/course/student.php b/course/student.php
index ad41e1442ebd3f1e7c6e93271bf2c778a3c76411..4aff6912cc328d53d3e12c8e1503f202aa5770d1 100644 (file)
--- a/course/student.php
+++ b/course/student.php
@@ -86,10 +86,11 @@
             }
         } else if (!empty($frm->showall)) {
             unset($frm->searchtext);
+            $frm->previoussearch = 0;
         }
-
     }
 
+    $previoussearch = (!empty($frm->search) or ($frm->previoussearch == 1)) ;
 
 /// Get all existing students for this course.
     if (!$students = get_course_students($course->id, "u.firstname ASC, u.lastname ASC", "", 0, 99999,
@@ -102,31 +103,31 @@
         $studentarray[] = $student->id;
     }
     $studentlist = implode(',', $studentarray);
+    
+    unset($studentarray);
 
 
 /// Get search results excluding any users already in this course
-    if (!empty($frm->searchtext)) {
-        if ($searchusers = get_users(true, $frm->searchtext, true, $studentlist, 'firstname ASC, lastname ASC', 
-                                      '', '', 0, 99999, 'id, firstname, lastname, email')) {
-            foreach ($searchusers as $student) {
-                $studentarray[] = $student->id;
-            }
-            $studentlist = implode(',', $studentarray);
-        }
+    if (!empty($frm->searchtext) and $previoussearch) {
+        $searchusers = get_users(true, $frm->searchtext, true, $studentlist, 'firstname ASC, lastname ASC', 
+                                      '', '', 0, 99999, 'id, firstname, lastname, email');
+        $usercount = get_users(false, '', true, $studentlist);
     }
-
-    unset($studentarray);
     
-/// Get potential students for this course excluding users already in course or
-/// users in the search results
+/// If no search results then get potential students for this course excluding users already in course
     if (empty($searchusers)) {
         if (!$users = get_users(true, '', true, $studentlist, 'firstname ASC, lastname ASC', '', '', 
                                 0, 99999, 'id, firstname, lastname, email') ) {
             $users = array();
         }
+        $usercount = count($users);
     }
 
+
+    
+
     $searchtext = (isset($frm->searchtext)) ? $frm->searchtext : "";
+    $previoussearch = ($previoussearch) ? '1' : '0';
 
     print_simple_box_start("center", "", "$THEME->cellheading");