--- loncom/interface/Attic/londropadd.pm	2007/07/26 23:56:35	1.165
+++ loncom/interface/Attic/londropadd.pm	2007/08/26 21:09:42	1.166
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to drop and add students in courses 
 #
-# $Id: londropadd.pm,v 1.165 2007/07/26 23:56:35 albertel Exp $
+# $Id: londropadd.pm,v 1.166 2007/08/26 21:09:42 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -45,7 +45,13 @@ use LONCAPA();
 ###############################################################
 ###############################################################
 sub header {
-    my $start_page=&Apache::loncommon::start_page('Enrollment Manager');
+    my ($jscript,$loaditems) = @_;
+    my $start_page;
+    if (ref($loaditems) eq 'HASH') {
+        $start_page=&Apache::loncommon::start_page('Enrollment Manager',$jscript,{'add_entries' => $loaditems,});
+    } else {
+        $start_page=&Apache::loncommon::start_page('Enrollment Manager',$jscript);
+    }
     return(<<ENDHEAD);
 $start_page
 <form method="post" enctype="multipart/form-data"  
@@ -738,7 +744,7 @@ sub print_upload_manager_form {
 ###############################################################
 ###############################################################
 sub enroll_single_student {
-    my $r=shift;
+    my ($r,$srcharray) = @_; 
     # Remove non alphanumeric values from section
     $env{'form.csec'}=~s/\W//g;
     #
@@ -823,6 +829,21 @@ sub enroll_single_student {
         $r->print(&mt('Invalid username or domain'));
     }    
     $r->print("<p><a href='/adm/dropadd?action=enrollstudent'>".&mt("Enroll another student")."</a></p>");
+    if (ref($srcharray) eq 'ARRAY') {
+        foreach my $item (@{$srcharray},'ccuname','ccdomain') {
+            $r->print('<input type="hidden" name="'.$item.'" value="'.$env{'form.'.$item}.'" />'."\n");
+        }
+    }
+    foreach my $item ('sortby','seluname','seludom') {
+        if (exists($env{'form.'.$item})) {
+            $r->print('<input type="hidden" name="'.$item.'" value="'.$env{'form.'.$item}.'" />'."\n");
+        }
+    }
+    $r->print('<input type="hidden" name="phase" value="get_user_info" />'."\n".
+              '<input type="hidden" name="currstate" value="" />'."\n".
+              '<input type="hidden" name="prevphase" value="" />'."\n".
+              '<input type="hidden" name="action" value="enrollstudent" />'."\n".
+              '<input type="hidden" name="state" value="gotusername" />');
 }
 
 sub setup_date_selectors {
@@ -936,9 +957,23 @@ sub make_dates_default {
 ## Single student enrollment routines (some of them)
 ##
 sub get_student_username_domain_form {
-    my $r = shift;
-    my $domform = &Apache::loncommon::select_dom_form
-        ($env{'course.'.$env{'request.course.id'}.'.domain'},'cudomain',0);
+    my ($r,$elements,$response,$srch,$forcenewuser) =  @_;
+    my $loaditems = {
+            'onload' => "javascript:setFormElements(document.studentform)",
+                     };
+    $r->print(&header(undef,$loaditems));
+    &Apache::lonhtmlcommon::add_breadcrumb
+        ({href=>"javascript:backPage(document.studentform,'','')",
+          text=>"Single user search"});
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Enroll Student',
+                                                  'Course_Add_Student'));
+    my $defdom=$env{'request.role.domain'};
+
+    my $jscript = &Apache::loncommon::studentbrowser_javascript()."\n".
+        '<script type="text/javascript">'."\n".
+        &Apache::lonhtmlcommon::set_form_elements($elements->{'studentform'}).
+        '</script>'."\n";
+
     my %lt=&Apache::lonlocal::texthash(
 		    'eos'  => "Enroll One Student",
 		    'usr'  => "Username",
@@ -946,34 +981,48 @@ sub get_student_username_domain_form {
                     'been' => "Begin Enrollment",
 				       );
     $r->print(<<END);
-<input type="hidden" name="action" value="enrollstudent" />
-<input type="hidden" name="state"  value="gotusername" />
+$jscript
 <h3>$lt{'eos'}</h3>
-<table>
-<tr><td class="LC_dropadd_labeltext"><label for="cuname">$lt{'usr'}</label>:</td>
-    <td><input type="text" name="cuname"  size="15" /></td></tr>
-<tr><td class="LC_dropadd_labeltext"><label for="cudomain">$lt{'dom'}</label>:</td>
-    <td>$domform</td></tr>
-<tr><td>&nbsp;</td>
-    <td>
-    <input type="submit" name="Begin Enrollment" value="$lt{'been'}" />
-    </td></tr>
-</table>
-<script type="text/javascript">
-// the if prevents the script error if the browser can not handle this
-if ( document.studentform.cuname ) { document.studentform.cuname.focus(); }
-</script>
 END
+    $r->print(&single_user_entry_form($defdom,$srch,$forcenewuser));
     return;
 }
 
+sub single_user_entry_form {
+    my ($dom,$srch,$forcenewuser) = @_;
+    my $userpicker =
+       &Apache::loncommon::user_picker($dom,$srch,$forcenewuser,
+                                       'document.studentform');
+    my $srchbutton = &mt('Search');
+    my $output = <<"ENDDOCUMENT";
+<input type="hidden" name="action" value="enrollstudent" />
+<input type="hidden" name="state" value="gotusername" />
+<input type="hidden" name="phase" value="get_user_info" />
+$userpicker
+<input name="userrole" type="button" value="$srchbutton" onclick="javascript:validateEntry(document.studentform)" />
+ENDDOCUMENT
+    return $output;
+}
+
 sub print_enroll_single_student_form {
-    my $r=shift;
+    my ($r,$jscript,$ccuname,$ccdomain,$srch) = @_;
+    $r->print(&header($jscript));
+    &Apache::lonhtmlcommon::add_breadcrumb
+        ({href=>"javascript:backPage(document.studentform,'','')",
+          text=>"Single user search"});
+    if ($env{'form.phase'} eq 'userpicked') {
+        &Apache::lonhtmlcommon::add_breadcrumb
+     ({href=>"javascript:backPage(document.studentform,'get_user_info','select')",
+       text=>"Select user",});
+    }
+    &Apache::lonhtmlcommon::add_breadcrumb
+      ({href=>"javascript:backPage(document.studentform,'$env{'form.phase'}','modify')",
+        text=>"Set enrollment",});
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Enroll Student',
+                                                  'Course_Add_Student'));
     $r->print("<h3>".&mt('Enroll One Student')."</h3>");
     #
-    my $username = &LONCAPA::clean_username($env{'form.cuname'});
-    my $domain   = &LONCAPA::clean_domain($env{'form.cudomain'});
-    my $home = &Apache::lonnet::homeserver($username,$domain);
+    my $home = &Apache::lonnet::homeserver($ccuname,$ccdomain);
     # $new_user flags whether we are creating a new user or using an old one
     my $new_user = 1;
     if ($home ne 'no_host') {
@@ -983,10 +1032,31 @@ sub print_enroll_single_student_form {
     my $user_data_html = '';
     my $javascript_validations = '';
     if ($new_user) {
+        my $usertoadd;
+        my $instsrch = {
+                         srchin => 'instd',
+                         srchby => 'uname',
+                         srchtype => 'exact',
+                         srchterm => $ccuname,
+                         srchdomain => $ccdomain,
+                       };
+        if (($instsrch->{'srchterm'} ne '') && ($instsrch->{'srchdomain'} ne '')) {
+            $usertoadd = $instsrch->{'srchterm'}.':'.$instsrch->{'srchdomain'};
+        }
+        my (%dirsrch_results,%inst_results);
+        if ($usertoadd) {
+            if (&Apache::loncreateuser::directorysrch_check($instsrch) eq 'ok') {
+                %dirsrch_results = &Apache::lonnet::inst_directory_query($instsrch);
+                if (ref($dirsrch_results{$usertoadd}) eq 'HASH') {
+                    %inst_results = %{$dirsrch_results{$usertoadd}};
+                }
+            }
+        }
+
         my $defdom=$env{'course.'.$env{'request.course.id'}.'.domain'};
         # Set up authentication forms
         my ($krbdef,$krbdefdom) =
-            &Apache::loncommon::get_kerberos_defaults($domain);
+            &Apache::loncommon::get_kerberos_defaults($ccdomain);
         $javascript_validations=&javascript_validations('auth',$krbdefdom);
         my %param = ( formname => 'document.studentform',
                       kerb_def_dom => $krbdefdom,
@@ -998,7 +1068,7 @@ sub print_enroll_single_student_form {
         #
         # Set up domain selection form
         my $homeserver_form = '';
-        my %servers = &Apache::lonnet::get_servers($domain,'library');
+        my %servers = &Apache::lonnet::get_servers($ccdomain,'library');
         $homeserver_form = '<select name="lcserver" size="1">'."\n".
             '<option value="default" selected>default</option>'."\n";
         while (my ($servername,$serverdescription) = each (%servers)) {
@@ -1021,20 +1091,20 @@ sub print_enroll_single_student_form {
 					   );
 	my $authhelp=&Apache::loncommon::help_open_topic('Auth_Options');
         $user_data_html = <<END;
-<h3>$lt{'udf'} $username:$domain</h3>
+<h3>$lt{'udf'} $ccuname:$ccdomain</h3>
 <table>
 <tr><td class="LC_dropadd_labeltext"><label for="cfirst">$lt{'fn'}</label>:</td>
-    <td><input type="text" name="cfirst"  size="15" /></td></tr>
+    <td><input type="text" name="cfirst" size="15" value="$inst_results{'firstname'}" /></td></tr>
 <tr><td class="LC_dropadd_labeltext"><label for="cmiddle">$lt{'mn'}</label>:</td>
-    <td><input type="text" name="cmiddle" size="15" /></td></tr>
+    <td><input type="text" name="cmiddle" size="15" value="$inst_results{'middlename'}" /></td></tr>
 <tr><td class="LC_dropadd_labeltext"><label for="clast">$lt{'ln'}</label>:</td>
-    <td><input type="text" name="clast"   size="15" /></td></tr>
+    <td><input type="text" name="clast" size="15" value="$inst_results{'lastname'}" /></td></tr>
 <tr><td class="LC_dropadd_labeltext"><label for="cgen">$lt{'gen'}</label>:</td>
-    <td><input type="text" name="cgen"    size="5"  /> </td></tr>
+    <td><input type="text" name="cgen" size="5" value="$inst_results{'generation'}" /> </td></tr>
 <tr><td class="LC_dropadd_labeltext"><label for="lcserver">$lt{'hs'}</label>:</td>
     <td>$homeserver_form</td></tr>
 <tr><td class="LC_dropadd_labeltext"><label for="emailaddress">$lt{'mail'}</label>:</td>
-    <td><input type="text" name="emailaddress" size="20" /></td></tr>
+    <td><input type="text" name="emailaddress" size="20" value="$inst_results{'permanentemail'}" /></td></tr>
 </table>
 <h3>$lt{'pswd'}</h3>
 $lt{'psam'}$authhelp
@@ -1049,7 +1119,7 @@ $locform
 END
     } else {
         # User already exists.  Do not worry about authentication
-        my %uenv = &Apache::lonnet::dump('environment',$domain,$username);
+        my %uenv = &Apache::lonnet::dump('environment',$ccdomain,$ccuname);
         $javascript_validations = &javascript_validations('noauth');
 	my %lt=&Apache::lonlocal::texthash(
 		       'udf'  => "User Data for",
@@ -1060,7 +1130,7 @@ END
                        'mail' => "Email Address",
 					   );
         $user_data_html = <<END;
-<h3>$lt{'udf'} $username:$domain</h3>
+<h3>$lt{'udf'} $ccuname:$ccdomain</h3>
 <input type="hidden" name="lcserver" value="default" />
 <table>
 <tr><td class="LC_dropadd_labeltext"><label for="cfirst">$lt{'fn'}</label>:</td>
@@ -1087,9 +1157,9 @@ END
 				       );
     $r->print(<<END);
 <input type="hidden" name="action" value="enrollstudent" />
-<input type="hidden" name="state"  value="done" />
-<input type="hidden" name="cuname" value="$username" />
-<input type="hidden" name="lcdomain" value="$domain" />
+<input type="hidden" name="state"  value="gotusername" />
+<input type="hidden" name="cuname" value="$ccuname" />
+<input type="hidden" name="lcdomain" value="$ccdomain" />
 <script type="text/javascript" language="Javascript">
 function verify(vf,sec_caller) {
     var founduname=0;
@@ -1149,6 +1219,19 @@ $lt{'disn'}
 <input type="button" onClick="verify(this.form,this.form.csec)" value="$lt{'eas'}" />
 </p>
 END
+    $r->print('<input type="hidden" name="currstate" value="" />'."\n".
+              '<input type="hidden" name="phase" value="" />'."\n".
+              '<input type="hidden" name="prevphase" value="'.$env{'form.phase'}.'" />'."\n");
+    if (ref($srch) eq 'HASH') {
+        foreach my $item (sort(keys(%{$srch}))) {
+            $r->print('<input type="hidden" name="'.$item.'" value="'.$srch->{$item}.'" />'."\n");
+        }
+    }
+    foreach my $item ('sortby','seluname','seludom') {
+        if (exists($env{'form.'.$item})) {
+            $r->print('<input type="hidden" name="'.$item.'" value="'.$env{'form.'.$item}.'" />'."\n");
+        }
+    }
     return;
 }
 
@@ -2529,13 +2612,14 @@ sub handler {
     # Start page
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
-    $r->print(&header());
     #
     # Main switch on form.action and form.state, as appropriate
     if (! exists($env{'form.action'})) {
+        $r->print(&header());
         $r->print(&Apache::lonhtmlcommon::breadcrumbs('Enrollment Manager'));
         my $action = &print_main_menu($r,$permission);
     } elsif ($env{'form.action'} eq 'upload' && $permission->{'enrl'}) {
+        $r->print(&header());
         &Apache::lonhtmlcommon::add_breadcrumb
             ({href=>'/adm/dropadd?action=upload&state=',
               text=>"Upload Classlist"});
@@ -2555,6 +2639,7 @@ sub handler {
             &print_first_courselist_upload_form($r);            
         }
     } elsif ($env{'form.action'} eq 'drop' && $permission->{'enrl'}) {
+        $r->print(&header());
         &Apache::lonhtmlcommon::add_breadcrumb
             ({href=>'/adm/dropadd?action=drop',
               text=>"Drop Students"});
@@ -2568,19 +2653,83 @@ sub handler {
             &print_drop_menu($r);
         }
     } elsif ($env{'form.action'} eq 'enrollstudent' && $permission->{'enrl'}) {
-        &Apache::lonhtmlcommon::add_breadcrumb
-            ({href=>'/adm/dropadd?action=enrollstudent',
-              text=>"Enroll Student"});
-        $r->print(&Apache::lonhtmlcommon::breadcrumbs('Enroll Student',
-						      'Course_Add_Student'));
-        if (! exists($env{'form.state'})) {
-            &get_student_username_domain_form($r);
-        } elsif ($env{'form.state'} eq 'gotusername') {
-            &print_enroll_single_student_form($r);
+        my @search = ('srchterm','srchby','srchin','srchtype','srchdomain');
+        my ($jsback,$elements) = &Apache::loncreateuser::crumb_utilities();
+        my $jscript = '<script type="text/javascript">'.$jsback.'</script>';
+        if ($env{'form.state'} eq 'gotusername') {
+            my $srch;
+            foreach my $item (@search) {
+                $srch->{$item} = $env{'form.'.$item};
+            }
+            print STDERR "phase = $env{'form.phase'}\n";
+            if ($env{'form.phase'} eq 'get_user_info') {
+                my ($currstate,$response,$forcenewuser,$results) =
+                    &Apache::loncreateuser::user_search_result($srch);
+                if ($currstate eq 'select') {
+                    $r->print(&header());
+                    &Apache::lonhtmlcommon::add_breadcrumb
+                        ({href=>"javascript:backPage(document.usersrchform,'','')",
+                          text=>"Single user search"},
+                         {href=>"javascript:backPage(document.usersrchform,'get_user_info','select')",
+                          text=>"Select User",});
+                    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Enroll Student',
+                                                                  'Course_Add_Student'));
+                    &Apache::loncreateuser::print_user_selection_page($r,
+                        $response,$srch,$results,'enrollstudent',\@search);
+                } elsif ($currstate eq 'modify') {
+                    my ($ccuname,$ccdomain);
+                    if (($srch->{'srchby'} eq 'uname') &&
+                        ($srch->{'srchtype'} eq 'exact')) {
+                        $ccuname = $srch->{'srchterm'};
+                        $ccdomain= $srch->{'srchdomain'};
+                    } else {
+                        my @matchedunames = keys(%{$results});
+                        ($ccuname,$ccdomain) = split(/:/,$matchedunames[0]);
+                    }
+                    $ccuname =&LONCAPA::clean_username($ccuname);
+                    $ccdomain=&LONCAPA::clean_domain($ccdomain);
+                    &print_enroll_single_student_form($r,$jscript,$ccuname,
+                                                      $ccdomain,$srch,$response);
+                } elsif ($currstate eq 'query') {
+                    $r->print(&header($jscript));
+                    &Apache::lonhtmlcommon::add_breadcrumb
+                        ({href=>"javascript:backPage(document.studentform,'','')",
+                          text=>"Single user search"});
+                    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Enroll Student',
+                                                      'Course_Add_Student'));
+                    &Apache::loncreateuser::print_user_query_page($r,'enrollstudent');
+                } else {
+                    &get_student_username_domain_form($r,$elements,$response,
+                                                      $srch,$forcenewuser);
+                }
+            } elsif ($env{'form.phase'} eq 'userpicked') {
+                my $ccuname = &LONCAPA::clean_username($env{'form.seluname'});
+                my $ccdomain = &LONCAPA::clean_domain($env{'form.seludom'});
+                &print_enroll_single_student_form($r,$jscript,$ccuname,
+                                                  $ccdomain,$srch);
+            } else {
+                &get_student_username_domain_form($r,$elements);
+            }
         } elsif ($env{'form.state'} eq 'enrolling') {
-            &enroll_single_student($r);
+            $r->print(&header($jscript));
+            &Apache::lonhtmlcommon::add_breadcrumb
+                ({href=>"javascript:backPage(document.studentform,'','')",
+                  text=>"Single user search"});
+            if ($env{'form.prevphase'} eq 'userpicked') {
+               &Apache::lonhtmlcommon::add_breadcrumb
+               ({href=>"javascript:backPage(document.studentform,'get_user_info','select')",
+                 text=>"Select user",});
+            }
+            &Apache::lonhtmlcommon::add_breadcrumb
+                ({href=>"javascript:backPage(document.studentform,'$env{'form.prevphase'}','modify')",
+                  text=>"Set enrollment",},
+                 {href=>"javascript:backPage(document.studentform,$env{'form.phase'},'')",
+                 text=>"Result",});
+            $r->print(&Apache::lonhtmlcommon::breadcrumbs('Enroll Student',
+                                                      'Course_Add_Student'));
+            &enroll_single_student($r,\@search);
         } else {
-            &get_student_username_domain_form($r);
+            &get_student_username_domain_form($r,$elements);
         }
     } elsif ($env{'form.action'} eq 'classlist' && $permission->{'view'}) {
         &Apache::lonhtmlcommon::add_breadcrumb