--- loncom/interface/Attic/londropadd.pm	2002/09/25 16:16:19	1.53
+++ loncom/interface/Attic/londropadd.pm	2002/09/26 14:04:34	1.55
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to drop and add students in courses 
 #
-# $Id: londropadd.pm,v 1.53 2002/09/25 16:16:19 matthew Exp $
+# $Id: londropadd.pm,v 1.55 2002/09/26 14:04:34 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -558,7 +558,7 @@ sub print_upload_manager_form {
 sub enroll_single_student {
     my $r=shift;
     $r->print('<h3>Enrolling Student</h3>');
-    $r->print('<p>Enrolling '.$ENV{'form.cuname'}." in domain ".
+    $r->print('<p>Enrolling '.$ENV{'form.cuname'}." \@ ".
               $ENV{'form.lcdomain'}.'</p>');
     if (($ENV{'form.cuname'})&&($ENV{'form.cuname'}!~/\W/)&&
         ($ENV{'form.lcdomain'})&&($ENV{'form.lcdomain'}!~/\W/)) {
@@ -594,17 +594,25 @@ sub enroll_single_student {
         my $home = &Apache::lonnet::homeserver($ENV{'form.cuname'},
                                                    $ENV{'form.lcdomain'});
         if ((($amode) && ($genpwd)) || ($home ne 'no_host')) {
+            # Clean out any old roles the student has in this class.
             &modifystudent($ENV{'form.lcdomain'},$ENV{'form.cuname'},
                            $ENV{'request.course.id'},$ENV{'form.csec'},
                             $desiredhost);
-          $r->print(&Apache::lonnet::modifystudent(
-                      $ENV{'form.lcdomain'},$ENV{'form.cuname'},
-                      $ENV{'form.cstid'},$amode,$genpwd,
- 	              $ENV{'form.cfirst'},$ENV{'form.cmiddle'},
-                      $ENV{'form.clast'},$ENV{'form.cgen'},
-                      $ENV{'form.csec'},$ENV{'form.enddate'},
-                      $ENV{'form.startdate'},$ENV{'form.forceid'},
-                    $desiredhost));
+            my $login_result = &Apache::lonnet::modifystudent
+                ($ENV{'form.lcdomain'},$ENV{'form.cuname'},
+                 $ENV{'form.cstid'},$amode,$genpwd,
+                 $ENV{'form.cfirst'},$ENV{'form.cmiddle'},
+                 $ENV{'form.clast'},$ENV{'form.cgen'},
+                 $ENV{'form.csec'},$ENV{'form.enddate'},
+                 $ENV{'form.startdate'},$ENV{'form.forceid'},
+                 $desiredhost);
+            if ($login_result =~ /^ok/) {
+                $r->print($login_result);
+                $r->print("<p> If active, the new role will be available ".
+                          "when the student next logs in to LON-CAPA.</p>");
+            } else {
+                $r->print("unable to enroll: ".$login_result);
+            }
 	} else {
             $r->print('<p><font color="#ff0000">ERROR</font>&nbsp;'.
                       'Invalid login mode or password.  '.
@@ -790,7 +798,8 @@ sub print_csv_classlist {
     if (! scalar(@$student_array)) {
         $r->print("There are no students currently enrolled.\n");
     } else {
-        &show_class_list($r,'csv','nolink','any',$student_array,$student_data);
+        &show_class_list($r,'csv','nolink','csv',
+                         'any',$student_array,$student_data);
     }
 }
 
@@ -1131,8 +1140,16 @@ sub get_enrollment_data {
 sub show_drop_list {
     my ($students,$s_data,$r)=@_;
     my $cid=$ENV{'request.course.id'};
-    $r->print(<<'END');
-<input type="hidden" name="action" value="drop" />
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+                                            ['sortby']);
+    my $sortby = $ENV{'form.sortby'};
+    if ($sortby !~ /^(username|domain|section|fullname|id)$/) {
+        $sortby = 'username';
+    }
+    my $action = "drop";
+    $r->print(<<END);
+<input type="hidden" name="sortby" value="$sortby" />
+<input type="hidden" name="action" value="$action" />
 <input type="hidden" name="state"  value="done" />
 <script>
 function checkAll(field) {
@@ -1148,10 +1165,28 @@ function uncheckAll(field) {
 <p>
 <input type="hidden" name="phase" value="four">
 <table border=2>
-<tr><th>&nbsp;</th><th>username</th><th>domain</th>
-    <th>ID</th><th>student name</th><th>section</th></tr>
+<tr><th>&nbsp;</th>
+    <th>
+       <a href="/adm/dropadd?action=$action&sortby=username">username</a>
+    </th><th>
+       <a href="/adm/dropadd?action=$action&sortby=domain">domain</a>
+    </th><th>
+       <a href="/adm/dropadd?action=$action&sortby=id">ID</a>
+    </th><th>
+       <a href="/adm/dropadd?action=$action&sortby=fullname">student name</a>
+    </th><th>
+       <a href="/adm/dropadd?action=$action&sortby=section">section</a>
+    </th>
+</tr>
 END
-    foreach my $student (@$students) {
+    my @Sorted_Students = sort {
+            lc($s_data->{$a.':'.$sortby})  cmp lc($s_data->{$b.':'.$sortby})
+                ||
+            lc($s_data->{$a.':username'}) cmp lc($s_data->{$b.':username'})
+                ||
+            lc($s_data->{$a.':domain'})   cmp lc($s_data->{$b.':domain'})
+        } @$students;
+    foreach my $student (@Sorted_Students) {
         my $error;
         if (exists($s_data->{$student.':error'})) {
             $error = $s_data->{$student.':error'};
@@ -1364,7 +1399,9 @@ sub upfile_drop_add {
                 }
             }
         } # end of foreach (@studentdata)
-        $r->print('<p>Processed Students: '.$count);
+        $r->print('<p>Processed Students: '.$count.'</p>');
+        $r->print("<p>If active, the new role will be available when the ".
+                  "students next log in to LON-CAPA.</p>");
         #####################################
         #           Drop students           #
         #####################################
@@ -1445,9 +1482,9 @@ sub drop_student_list {
         my ($uname,$udom)=split(/\:/,$_);
         my $result = &modifystudent($udom,$uname,$ENV{'request.course.id'});
         if ($result eq 'ok' || $result eq 'ok:') {
-            $r->print('Dropped '.$uname.' at '.$udom.'<br>');
+            $r->print('Dropped '.$uname.' @ '.$udom.'<br>');
         } else {
-            $r->print('Error dropping '.$uname.' at '.$udom.': '.$result.
+            $r->print('Error dropping '.$uname.' @ '.$udom.': '.$result.
                       '<br />');
         }
         $count++;
@@ -1541,7 +1578,7 @@ sub handler {
         } elsif ($ENV{'form.state'} eq 'done') {
             &drop_student_list($r);
         } else {
-            &menu_phase_two_drop($r);
+            &print_drop_menu($r);
         }
     } elsif ($ENV{'form.action'} eq 'enrollstudent') {
         if (! exists($ENV{'form.state'})) {