--- loncom/interface/Attic/londropadd.pm	2005/11/01 20:47:15	1.131
+++ loncom/interface/Attic/londropadd.pm	2006/11/23 00:17:01	1.149
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to drop and add students in courses 
 #
-# $Id: londropadd.pm,v 1.131 2005/11/01 20:47:15 albertel Exp $
+# $Id: londropadd.pm,v 1.149 2006/11/23 00:17:01 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -39,19 +39,14 @@ use Apache::Constants qw(:common :http R
 use Spreadsheet::WriteExcel;
 use Apache::lonstathelpers();
 use Apache::lonlocal;
+use Apache::longroup;
 
 ###############################################################
 ###############################################################
 sub header {
-    my $html=&Apache::lonxml::xmlbegin();
-    my $bodytag=&Apache::loncommon::bodytag('Enrollment Manager');
-    my $title = &mt('LON-CAPA Enrollment Manager');
+    my $start_page=&Apache::loncommon::start_page('Enrollment Manager');
     return(<<ENDHEAD);
-$html
-<head>
-<title>$title</title>
-</head>
-$bodytag
+$start_page
 <form method="post" enctype="multipart/form-data"  
       action="/adm/dropadd" name="studentform">
 ENDHEAD
@@ -83,7 +78,7 @@ sub modifystudent {
             } elsif ( ((!$section) && (!$csec)) || ($section ne $csec) ) {
                 my (undef,$end,$start)=split(/\_/,$roles{$course});
                 my $now=time;
-                # if this is an active role 
+                # if this is an active role
                 if (!($start && ($now<$start)) || !($end && ($now>$end))) {
                     my $reply=&Apache::lonnet::modifystudent
                         # dom  name  id mode pass     f     m     l     g
@@ -137,7 +132,8 @@ sub domain_form {
 ###############################################################
 #  Menu Phase One
 sub print_main_menu {
-    my ($r,$enrl_permission,$view_permission)=@_;
+    my ($r,$enrl_permission,$view_permission,$grp_manage_permission,
+        $grp_view_permission)=@_;
     #
     my ($cdom,$cnum) = split/_/,$env{'request.course.id'};
     my @menu = 
@@ -171,6 +167,26 @@ sub print_main_menu {
             permission => &Apache::lonnet::auto_run($cnum,$cdom),
             url  => '/adm/populate',
             },
+          { text => 'Create a new group',
+            help => 'Course_Create_Group',
+            permission => $grp_manage_permission,
+            url => '/adm/coursegroups?refpage=enrl&action=create',
+            },
+          { text => 'Modify an existing group',
+            help => 'Course_Modify_Group',
+            permission => $grp_manage_permission,
+            url => '/adm/coursegroups?refpage=enrl&action=modify',
+            },
+#          { text => 'Delete an existing group',
+#            help => 'Course_Delete_Group',
+#            permission => $grp_manage_permission,
+#            url => '/adm/coursegroups?refpage=enrl&action=delete',
+#            },
+          { text => 'Enter an existing group',
+            help => 'Course_Display_Group',
+            permission => $grp_view_permission,
+            url => '/adm/coursegroups?refpage=enrl&action=view',
+            },
           );
     my $menu_html = '';
     foreach my $menu_item (@menu) {
@@ -234,7 +250,7 @@ sub print_upload_manager_header {
     #
     my $javascript_validations=&javascript_validations('auth',$krbdefdom,
                                     $password_choice);
-    my $checked=(($env{'form.noFirstLine'})?' checked="1"':'');
+    my $checked=(($env{'form.noFirstLine'})?' checked="checked" ':'');
     $r->print('<h3>'.&mt('Uploading Class List')."</h3>\n".
               "<hr>\n".
               '<h3>'.&mt('Identify fields')."</h3>\n");
@@ -253,7 +269,7 @@ sub print_upload_manager_header {
     $r->print('<input type="button" value="Reverse Association" '.
               'name="'.&mt('Reverse Association').'" '.
               'onClick="javascript:this.form.associate.value=\'Reverse Association\';submit(this.form);" />');
-    $r->print('<label><input type="checkbox" name="noFirstLine" $checked />'.
+    $r->print('<label><input type="checkbox" name="noFirstLine"'.$checked.'/>'.
               &mt('Ignore First Line').'</label>');
     $r->print("<hr />\n".
               '<script type="text/javascript" language="Javascript">'."\n".
@@ -292,7 +308,7 @@ sub javascript_validations {
          ipass    => 'You need to specify the initial password.',
          name     => 'The optional name field was not specified.',
          snum     => 'The optional student number field was not specified.',
-         section  => 'The optional section or group field was not specified.', 
+         section  => 'The optional section field was not specified.', 
          email    => 'The optional email address field was not specified.',
          continue => 'Continue enrollment?',
          );
@@ -378,6 +394,7 @@ END
     }
 END
     }
+    my $section_checks;
     my $optional_checks = '';
     if ( ($mode eq 'createcourse') || ($mode eq 'modifycourse') ) {
         $optional_checks = (<<END);
@@ -385,6 +402,7 @@ END
 }
 END
     } else {
+        $section_checks = &section_check_js();
         $optional_checks = (<<END);
     var message='';
     if (foundname==0) { 
@@ -425,7 +443,7 @@ END
     if ( ($mode eq 'auth') || ($mode eq 'createcourse') || ($mode eq 'modifycourse')  ) {
         $result .= $auth_checks;
     }
-    $result .= $optional_checks;
+    $result .= $optional_checks."\n".$section_checks;
     if ( ($mode eq 'auth') || ($mode eq 'createcourse') || ($mode eq 'modifycourse')  ) {
         $result .= $authheader;
     }
@@ -436,7 +454,7 @@ END
 ###############################################################
 sub upload_manager_javascript_forward_associate {
     return(<<ENDPICK);
-function verify(vf) {
+function verify(vf,sec_caller) {
     var founduname=0;
     var foundpwd=0;
     var foundname=0;
@@ -529,7 +547,7 @@ ENDPICK
 ###############################################################
 sub upload_manager_javascript_reverse_associate {
     return(<<ENDPICK);
-function verify(vf) {
+function verify(vf,sec_caller) {
     var founduname=0;
     var foundpwd=0;
     var foundname=0;
@@ -625,7 +643,8 @@ sub print_upload_manager_footer {
     $Str .= &mt('Disable ID/Student Number Safeguard and Force Change '.
                 'of Conflicting IDs (only do if you know what you are doing)').
                 "</label>\n</p><p>\n";
-    $Str .= '<input type="button" onClick="javascript:verify(this.form)" '.
+    $Str .= '<input type="button"'. 
+              'onClick="javascript:verify(this.form,this.form.csec)" '.
         'value="Update Class List" />'."<br />\n";
     $Str .= &mt('Note: for large courses, this operation may be time '.
                 'consuming');
@@ -686,7 +705,7 @@ sub print_upload_manager_form {
              ['lname',&mt('Last Name'),       $env{'form.lname_choice'}],
              ['gen',  &mt('Generation'),      $env{'form.gen_choice'}],
              ['id',   &mt('ID/Student Number'),$env{'form.id_choice'}],
-             ['sec',  &mt('Group/Section'),   $env{'form.sec_choice'}],
+             ['sec',  &mt('Section'),          $env{'form.sec_choice'}],
              ['ipwd', &mt('Initial Password'),$env{'form.ipwd_choice'}],
              ['email',&mt('EMail Address'),   $env{'form.email_choice'}]);
 	if ($env{'form.upfile_associate'} eq 'reverse') {	
@@ -890,7 +909,8 @@ sub make_dates_default {
         $result .= "Set default start and end dates for course<br />";
         #
         # Refresh the course environment
-        &Apache::lonnet::coursedescription($env{'request.course.id'});
+        &Apache::lonnet::coursedescription($env{'request.course.id'},
+					   {'freshen_cache' => 1});
     } else {
         $result .= &mt('Unable to set default dates for course').":".$put_result.
             '<br />';
@@ -1058,7 +1078,7 @@ END
         # Print it all out
     my %lt=&Apache::lonlocal::texthash(
 		   'cd'   => "Course Data",
-                   'gs'   => "Group/Section",
+                   'gs'   => "Section",
                    'idsn' => "ID/Student Number",
                    'disn' => "Disable ID/Student Number Safeguard and Force Change of Conflicting IDs (only do if you know what you are doing)",
                    'eas'  => "Enroll as student",
@@ -1069,7 +1089,7 @@ END
 <input type="hidden" name="cuname" value="$username" />
 <input type="hidden" name="lcdomain" value="$domain" />
 <script type="text/javascript" language="Javascript">
-function verify(vf) {
+function verify(vf,sec_caller) {
     var founduname=0;
     var foundpwd=0;
     var foundname=0;
@@ -1086,6 +1106,9 @@ function verify(vf) {
     }
     if ((typeof(vf.csec.value)!="undefined") && (vf.csec.value!='')) {
         foundsec=1;
+        if (validate(sec_caller) == "error") {
+            return;
+        }
     }
     if ((typeof(vf.cstid.value)!="undefined") && (vf.cstid.value!='')) {
 	foundid=1;
@@ -1122,7 +1145,7 @@ $lt{'idsn'}: <input type="text" name="cs
 $lt{'disn'}
 </label>
 </p><p>
-<input type="button" onClick="verify(this.form)" value="$lt{'eas'}">
+<input type="button" onClick="verify(this.form,this.form.csec)" value="$lt{'eas'}">
 </p>
 END
     return;
@@ -1149,7 +1172,7 @@ sub print_html_classlist {
     if (! exists($env{'form.sortby'})) {
         $env{'form.sortby'} = 'username';
     }
-    if ($env{'form.Status'} !~ /^(Any|Expired|Active)$/) {
+    if ($env{'form.Status'} !~ /^(Any|Expired|Active|Future)$/) {
         $env{'form.Status'} = 'Active';
     }
     my $status_select = &Apache::lonhtmlcommon::StatusOptions
@@ -1166,10 +1189,11 @@ sub print_html_classlist {
         $env{'form.output'} = 'html';
     }
     #
-    $r->print('<br /><table border="2">');
+    $r->print('<br />'.&Apache::loncommon::start_data_table());
     foreach my $role (sort keys %coursepersonnel) {
         next if ($role =~ /^\s*$/);
-	$r->print('<tr><td>'.$role.'</td><td>');
+	$r->print(&Apache::loncommon::start_data_table_row().
+		  '<td>'.$role.'</td><td>');
         foreach my $user (split(',',$coursepersonnel{$role})) {
 	    my ($puname,$pudom)=split(':',$user);
 	    $r->print(' '.&Apache::loncommon::aboutmewrapper(
@@ -1177,9 +1201,9 @@ sub print_html_classlist {
                                                                   $pudom),
                                                              $puname,$pudom));
 	}
-        $r->print('</td></tr>');
+        $r->print('</td>'.&Apache::loncommon::end_data_table_row());
     }
-    $r->print('</table>');
+    $r->print(&Apache::loncommon::end_data_table());
     #
     # Interface output
     $r->print('<input type="hidden" name="action" value="'.
@@ -1226,6 +1250,10 @@ sub print_html_classlist {
 sub show_class_list {
     my ($r,$mode,$linkto,$statusmode,$classlist,$keylist)=@_;
     my $cid=$env{'request.course.id'};
+    my $cdom = $env{'course.'.$cid.'.domain'};
+    my $cnum = $env{'course.'.$cid.'.num'};
+    my ($classgroups) = &Apache::loncoursedata::get_group_memberships(
+                                              $classlist,$keylist,$cdom,$cnum);
     #
     # Variables for excel output
     my ($excel_workbook, $excel_sheet, $excel_filename,$row,$format);
@@ -1234,9 +1262,14 @@ sub show_class_list {
     my ($CSVfile,$CSVfilename);
     #
     my $sortby = $env{'form.sortby'};
-    if ($sortby !~ /^(username|domain|section|fullname|id|start|end|type)$/) {
+    if ($sortby !~ /^(username|domain|section|groups|fullname|id|start|end|type)$/) {
         $sortby = 'username';
     }
+    if (! exists($env{'form.displayphotos'})) {
+        $env{'form.displayphotos'} = 'off';
+    }
+    my $displayphotos = $env{'form.displayphotos'};
+
     # Print out header 
     unless ($mode eq 'autoenroll') {
         $r->print(<<END);
@@ -1245,21 +1278,24 @@ END
     }
     $r->print(<<END);
 <input type="hidden" name="sortby" value="$sortby" />
+<input type="hidden" name="displayphotos" value="$displayphotos" />
 END
     if ($mode eq 'html' || $mode eq 'view' || $mode eq 'autoenroll') {
         if ($linkto eq 'aboutme') {
-            $r->print(&mt('Select a user name to view the users personal page.'));
+            $r->print(&mt("Select a user name to view the user's personal page."));
         } elsif ($linkto eq 'modify') {
-            $r->print(&mt('Select a user name to modify the students information'));
+            $r->print(&mt("Select a user name to modify the student's information"));
         }
 	my %lt=&Apache::lonlocal::texthash(
                                            'usrn'   => "username",
                                            'dom'    => "domain",
                                            'sn'     => "student name",
                                            'sec'    => "section",
+                                           'grp'    => "active groups",
                                            'start'  => "start date",
                                            'end'    => "end date",
-                                           'type'   => "enroll type/action"
+                                           'type'   => "enroll type/action",
+                                           'photo'  => "photo",
 					   );
         unless ($mode eq 'autoenroll') {
             $r->print(<<END);
@@ -1267,9 +1303,22 @@ END
 <input type="hidden" name="sdom"   value="" />
 END
         }
+        if ($env{'course.'.$env{'request.course.id'}.'.internal.showphoto'}) {
+            $r->print('
+<script type="text/javascript">
+function photowindow(photolink) {
+    var title = "Photo_Viewer";
+    var options = "scrollbars=1,resizable=1,menubar=0";
+    options += ",width=240,height=240";
+    stdeditbrowser = open(photolink,title,options,"1");
+    stdeditbrowser.focus();
+}
+</script>
+           ');
+        }
         $r->print("
 <p>
-<table border=2>
+".&Apache::loncommon::start_data_table()."
 <tr>
         ");
         if ($mode eq 'autoenroll') {
@@ -1296,9 +1345,26 @@ END
        <a href="javascript:document.studentform.sortby.value='start';document.studentform.submit();">$lt{'start'}</a>
     </th><th>
        <a href="javascript:document.studentform.sortby.value='end';document.studentform.submit();">$lt{'end'}</a>
+    </th><th>
+       <a href="javascript:document.studentform.sortby.value='groups';document.studentform.submit();">$lt{'grp'}</a>
     </th>
-  </tr>
 END
+        if ($env{'course.'.$env{'request.course.id'}.'.internal.showphoto'}) {
+            my %photo_options = &Apache::lonlocal::texthash(
+                                                            'on' => 'Show',
+                                                            'off' => 'Hide',
+                                                            );
+            my $photochg = 'on';
+            if ($displayphotos eq 'on') {
+                $photochg = 'off';
+            }
+            $r->print('    <th>'."\n".'     '. 
+            '<a href="javascript:document.studentform.displayphotos.value='.
+                      "'".$photochg."'".';document.studentform.submit();">'.
+                      $photo_options{$photochg}.'</a>&nbsp;'.$lt{'photo'}."\n".
+                      '    </th>'."\n");
+        }
+        $r->print("  </tr>\n");
     } elsif ($mode eq 'csv') {
 	#
 	# Open a file
@@ -1317,16 +1383,20 @@ END
         if($statusmode eq 'Expired') {
             print $CSVfile '"'.&mt('Students with expired roles').'"'."\n";
         }
+        if($statusmode eq 'Future') {
+            print $CSVfile '"'.&mt('Students with future roles').'"'."\n";
+        }
         if ($statusmode eq 'Any') {
             print $CSVfile '"'.join('","',map {
 		&Apache::loncommon::csv_translate(&mt($_))
                 } ("username","domain","ID","student name",
-                   "section","start date","end date","status")).'"'."\n";
+                   "section","start date","end date","status","active groups"))
+                  .'"'."\n";
         } else {
             print $CSVfile '"'.join('","',map {
 		&Apache::loncommon::csv_translate(&mt($_))
                 } ("username","domain","ID","student name",
-                   "section","start date","end date")).'"'."\n";
+                   "section","start date","end date","active groups")).'"'."\n";
         }
     } elsif ($mode eq 'excel') {
         # Create the excel spreadsheet
@@ -1341,7 +1411,8 @@ END
         #
         $excel_sheet->write($row++,0,["username","domain","ID",
                                       "student name","section",
-                                      "start date","end date","status"],
+                                      "start date","end date","status",
+                                      "active groups"],
                             $format->{'bold'});
     }
     #
@@ -1351,6 +1422,7 @@ END
     foreach (@$keylist) {
         $index{$_} = $i++;
     }
+    $index{'groups'} = scalar(@{$keylist});
     my $index  = $index{$sortby};
     my $second = $index{'username'};
     my $third  = $index{'domain'};
@@ -1368,9 +1440,14 @@ END
     my $lockcount = 0;
     foreach my $student (@Sorted_Students) {
         my $sdata = $classlist->{$student};
+        my $groups = $classgroups->{$student};
         my $username = $sdata->[$index{'username'}];
         my $domain   = $sdata->[$index{'domain'}];
         my $section  = $sdata->[$index{'section'}];
+        my $active_groups;
+        if (ref($groups->{active}) eq 'HASH') {
+            $active_groups = join(', ',keys(%{$groups->{'active'}}));
+        }
         my $name     = $sdata->[$index{'fullname'}];
         my $id       = $sdata->[$index{'id'}];
         my $status   = $sdata->[$index{'status'}];
@@ -1389,7 +1466,7 @@ END
             } else {
                 $end = &Apache::lonlocal::locallocaltime($end);
             }
-            $r->print("<tr>\n    ");
+	    $r->print(&Apache::loncommon::start_data_table_row());
             if ($mode eq 'autoenroll') {
                 my $lockedtype = $sdata->[$index{'lockedtype'}];
                 $studentcount++;
@@ -1436,8 +1513,22 @@ END
     <td>$section</td>
     <td>$start</td>
     <td>$end</td>
-   </tr>
+    <td>$active_groups</td>
 END
+            if ($env{'course.'.$env{'request.course.id'}.
+			 '.internal.showphoto'}) {
+                if ($displayphotos eq 'on') {
+                    my $imgurl = 
+			&Apache::lonnet::retrievestudentphoto($domain,
+							      $username,'gif',
+							      'thumbnail');
+                
+                    $r->print('    <td align="right"><a href="javascript:photowindow('."'".&Apache::lonnet::studentphoto($domain,$username,'jpg')."'".')"><img src="'.$imgurl.'" border="1"></a></td>');
+                } else {
+                    $r->print('    <td>&nbsp;</td>  ');
+                }
+            }
+	    $r->print(&Apache::loncommon::end_data_table_row());
         } elsif ($mode eq 'csv') {
             next if (! defined($CSVfile));
             # no need to bother with $linkto
@@ -1458,6 +1549,7 @@ END
             if ($statusmode eq 'Any') {
                 push @line,&Apache::loncommon::csv_translate($status);
             }
+            push @line,&Apache::loncommon::csv_translate($active_groups);
             print $CSVfile '"'.join('","',@line).'"'."\n";
         } elsif ($mode eq 'excel') {
             $excel_sheet->write($row,0,[$username,$domain,$id,
@@ -1473,11 +1565,12 @@ END
                 }                    
             }
             $excel_sheet->write($row,$col++,$status);
+            $excel_sheet->write($row,$col++,$active_groups);
             $row++;
         }
     }
     if ($mode eq 'view' || $mode eq 'html' || $mode eq 'autoenroll') {
-        $r->print('</table><br>');
+	$r->print(&Apache::loncommon::end_data_table().'<br />');
     } elsif ($mode eq 'excel') {
         $excel_workbook->close();
         $r->print('<p><a href="'.$excel_filename.'">'.
@@ -1517,7 +1610,7 @@ sub print_modify_student_form {
                   '<p>'.
                   &mt('Unable to retrieve environment data for').' '.$sname.
                   &mt('in domain').' '.$sdom.'</p><p>'.
-                  &mt('Please contact your LON-CAPA administrator regarding this situation.').'</p></body></html>');
+                  &mt('Please contact your LON-CAPA administrator regarding this situation.').'</p>'.&Apache::loncommon::end_page());
         return;
     }
     # determine the students starting and ending times and section
@@ -1552,7 +1645,7 @@ sub print_modify_student_form {
     my $date_table = &date_setting_table($starttime,$endtime);
     #
     if (! exists($env{'form.Status'}) || 
-        $env{'form.Status'} !~ /^(Any|Expired|Active)$/) {
+        $env{'form.Status'} !~ /^(Any|Expired|Active|Future)$/) {
         $env{'form.Status'} = 'crap';
     }
     # Make sure student is enrolled in course
@@ -1569,7 +1662,19 @@ sub print_modify_student_form {
                    'sec'   => "Section",
                    'sm'    => "Submit Modifications",
 				       );
-    $r->print(<<END);
+# Check if section name is valid
+    my $section_check = &section_check_js();
+    $r->print(<<"END");
+<script type="text/javascript">
+$section_check
+function secverify(formname,caller) {
+    if (validate(caller) == "error") {
+        return;
+    } else {
+        formname.submit();
+    }
+}
+</script>
 <p>
 <font size="+1">
 $lt{'odcc'}
@@ -1605,9 +1710,9 @@ $lt{'disn'}
 </p>
 <p>$current_date_description</p>
 <p>$date_table</p>
-<input type="submit" value="$lt{'sm'}" />
-</body></html>
+<input type="button" value="$lt{'sm'}" onClick="secverify(this.form,this.form.section)" />
 END
+    $r->print(&Apache::loncommon::end_page());
     return;
 }
 
@@ -1615,7 +1720,7 @@ END
 # modify a single students section 
 #
 sub modify_single_student {
-    my $r = shift;
+    my ($r) = @_;
     #
     # Remove non alphanumeric values from the section
     $env{'form.section'} =~ s/\W//g;
@@ -1757,8 +1862,8 @@ END
 <input type="hidden" name="sortby" value="$sortby" />
 <input type="hidden" name="Status" value="$status" />
 <a href="javascript:document.studentform.submit();">$Masd</a>
-</body></html>
 END
+    $r->print(&Apache::loncommon::end_page());
     return;
 }
 
@@ -1829,9 +1934,13 @@ sub show_drop_list {
                                                 ['sortby']);
     }
     my $sortby = $env{'form.sortby'};
-    if ($sortby !~ /^(username|domain|section|fullname|id|start|end)$/) {
+    if ($sortby !~ /^(username|domain|section|groups|fullname|id|start|end)$/) {
         $sortby = 'username';
     }
+    my $cdom = $env{'course.'.$cid.'.domain'};
+    my $cnum = $env{'course.'.$cid,'.num'};
+    my ($classgroups) = &Apache::loncoursedata::get_group_memberships(
+                                              $classlist,$keylist,$cdom,$cnum);
     #
     my $action = "drop";
     $r->print(<<END);
@@ -1859,10 +1968,11 @@ my %lt=&Apache::lonlocal::texthash('usrn
                                    'sec'    => "section",
                                    'start'  => "start date",
                                    'end'    => "end date",
+                                   'groups' => "active groups",
                                    );
     if ($nosort) {
+	$r->print(&Apache::loncommon::start_data_table());
         $r->print(<<END);
-<table border=2>
 <tr>
     <th>&nbsp;</th>
     <th>$lt{'usrn'}</th>
@@ -1872,12 +1982,13 @@ my %lt=&Apache::lonlocal::texthash('usrn
     <th>$lt{'sec'}</th>
     <th>$lt{'start'}</th>
     <th>$lt{'end'}</th>
+    <th>$lt{'groups'}</th>
 </tr>
 END
 
     } else  {
+	$r->print(&Apache::loncommon::start_data_table());
         $r->print(<<END);
-<table border=2>
 <tr><th>&nbsp;</th>
     <th>
        <a href="/adm/dropadd?action=$action&sortby=username">$lt{'usrn'}</a>
@@ -1893,6 +2004,8 @@ END
        <a href="/adm/dropadd?action=$action&sortby=start">$lt{'start'}</a>
     </th><th>
        <a href="/adm/dropadd?action=$action&sortby=end">$lt{'end'}</a>
+    </th><th>
+       <a href="/adm/dropadd?action=$action&sortby=groups">$lt{'groups'}</a>
     </th>
 </tr>
 END
@@ -1904,6 +2017,7 @@ END
     foreach (@$keylist) {
         $index{$_} = $i++;
     }
+    $index{'groups'} = scalar(@$keylist);
     my $index  = $index{$sortby};
     my $second = $index{'username'};
     my $third  = $index{'domain'};
@@ -1924,6 +2038,11 @@ END
         my $id       = $sdata->[$index{'id'}];
         my $start    = $sdata->[$index{'start'}];
         my $end      = $sdata->[$index{'end'}];
+        my $groups = $classgroups->{$student};
+        my $active_groups;
+        if (ref($groups->{active}) eq 'HASH') {
+            $active_groups = join(', ',keys(%{$groups->{'active'}}));
+        }
         if (! defined($start) || $start == 0) {
             $start = &mt('none');
         } else {
@@ -1937,8 +2056,8 @@ END
         my $status   = $sdata->[$index{'status'}];
         next if ($status ne 'Active');
         #
+        $r->print(&Apache::loncommon::start_data_table_row());
         $r->print(<<"END");
-<tr>
     <td><input type="checkbox" name="droplist" value="$student"></td>
     <td>$username</td>
     <td>$domain</td>
@@ -1947,10 +2066,11 @@ END
     <td>$section</td>
     <td>$start</td>
     <td>$end</td>
-</tr>
+    <td>$active_groups</td>
 END
+        $r->print(&Apache::loncommon::end_data_table_row());
     }
-    $r->print('</table><br>');
+    $r->print(&Apache::loncommon::end_data_table().'<br />');
     %lt=&Apache::lonlocal::texthash(
 	               'dp'   => "Drop Students",
                        'ca'   => "check all",
@@ -1987,7 +2107,7 @@ sub print_first_courselist_upload_form {
     $str .= &Apache::loncommon::help_open_topic("Course_Convert_To_CSV",
                            &mt("How do I create a CSV file from a spreadsheet")).
                                "<br />\n";
-    $str .= "</body>\n</html>\n";
+    $str .= &Apache::loncommon::end_page();
     $r->print($str);
     return;
 }
@@ -2043,7 +2163,7 @@ sub upfile_drop_add {
         if (! exists($home_servers{$desiredhost})) {
             $r->print('<font color="#ff0000">'.&mt('Error').'</font>'.
                       &mt('Invalid home server specified'));
-            $r->print("</body>\n</html>\n");
+            $r->print(&Apache::loncommon::end_page());
             return;
         }
     }
@@ -2081,6 +2201,8 @@ sub upfile_drop_add {
         my $count=0;
         my $flushc=0;
         my %student=();
+        # Get information about course groups
+        my %curr_groups = &Apache::longroup::coursegroups();
         # Get new classlist
         foreach (@studentdata) {
             my %entries=&Apache::loncommon::record_sep($_);
@@ -2121,6 +2243,17 @@ sub upfile_drop_add {
                     }
                     # remove non alphanumeric values from section
                     $sec =~ s/\W//g;
+                    if ($sec eq "none" || $sec eq 'all') {
+                        $r->print('<br />'.
+      &mt('<b>[_1]</b>: Unable to enroll: section name "[_2]" for user [_3] [_4] [_5] [_6] is a reserved word.',
+                        $username,$sec,$fname,$mname,$lname,$gen));
+                        next;
+                    } elsif (($sec ne '') && (exists($curr_groups{$sec}))) {
+                        $r->print('<br />'.
+      &mt('<b>[_1]</b>: Unable to enroll: section name "[_2]" for user [_3] [_4] [_5] [_6] is a course group. Section names and group names must be distinct.',
+                        $username,$sec,$fname,$mname,$lname,$gen));
+                        next;
+                    }
                     # determine student id number
                     my $id='';
                     if (defined($fields{'id'})) {
@@ -2236,6 +2369,33 @@ sub drop_student_list {
     $r->print('<p>'.&mt('Re-enrollment will re-activate data.')) if ($count);
 }
 
+sub section_check_js {
+    my $groupslist;
+    my %curr_groups = &Apache::longroup::coursegroups();
+    if (%curr_groups) {
+        $groupslist = join('","',sort(keys(%curr_groups)));
+    }
+    return <<"END";
+function validate(caller) {
+    var groups = new Array("$groupslist");
+    var secname = caller.value;
+    if ((secname == 'all') || (secname == 'none')) {
+        alert("'"+secname+"' may not be used as the name for a section, as it is a reserved word.\\nPlease choose a different section name.");
+        return 'error';
+    }
+    if (secname != '') {
+        for (var k=0; k<groups.length; k++) {
+            if (secname == groups[k]) {
+                alert("'"+secname+"' may not be used as the name for a section, as it is the name of a course group.\\nSection names and group names must be distinct. Please choose a different section name.");
+                return 'error';
+            }
+        }
+    }
+    return 'ok';
+}
+END
+}
+
 ###################################################################
 ###################################################################
 
@@ -2289,7 +2449,8 @@ sub handler {
     if (! ($env{'request.course.fn'})) {
         # Not in a course
         $env{'user.error.msg'}=
-            "/adm/dropadd:cst:0:0:Cannot drop or add students";
+            "/adm/dropadd:cst:0:0:Cannot manage or view course groups, ".
+                                  "or drop or add students";
         return HTTP_NOT_ACCEPTABLE; 
     }
     #
@@ -2297,11 +2458,21 @@ sub handler {
         &Apache::lonnet::allowed('vcl',$env{'request.course.id'});
     my $enrl_permission = 
         &Apache::lonnet::allowed('cst',$env{'request.course.id'});
-    if (! $view_permission && ! $enrl_permission) {
+
+    my $grp_view_permission =
+        &Apache::lonnet::allowed('vcg',$env{'request.course.id'});
+    my $grp_manage_permission =
+        &Apache::lonnet::allowed('mdg',$env{'request.course.id'});
+
+
+    if (! $grp_view_permission && ! $grp_manage_permission && 
+                                  ! $view_permission && ! $enrl_permission) {
         $env{'user.error.msg'}=
-            "/adm/dropadd:cst:0:0:Cannot drop or add students";
-        return HTTP_NOT_ACCEPTABLE;        
+     "/adm/coursegroups:cst:0:0:Cannot manage or view course groups, ".
+                                 "or drop or add students";
+        return HTTP_NOT_ACCEPTABLE;
     }
+
     #
     # Only output the header information if they did not request csv format
     #
@@ -2312,15 +2483,15 @@ sub handler {
     #
     # Main switch on form.action and form.state, as appropriate
     if (! exists($env{'form.action'})) {
-        $r->print(&Apache::lonhtmlcommon::breadcrumbs
-                  (undef,'Enrollment Manager'));
-        &print_main_menu($r,$enrl_permission,$view_permission);
+        $r->print(&Apache::lonhtmlcommon::breadcrumbs('Enrollment Manager'));
+        &print_main_menu($r,$enrl_permission,$view_permission,$grp_manage_permission,
+                         $grp_view_permission);
     } elsif ($env{'form.action'} eq 'upload' && $enrl_permission) {
         &Apache::lonhtmlcommon::add_breadcrumb
             ({href=>'/adm/dropadd?action=upload&state=',
               text=>"Upload Classlist"});
-        $r->print(&Apache::lonhtmlcommon::breadcrumbs
-                  (undef,'Upload Classlist','Course_Create_Class_List'));
+        $r->print(&Apache::lonhtmlcommon::breadcrumbs('Upload Classlist',
+						      'Course_Create_Class_List'));
         if (! exists($env{'form.state'})) {
             &print_first_courselist_upload_form($r);            
         } elsif ($env{'form.state'} eq 'got_file') {
@@ -2338,8 +2509,8 @@ sub handler {
         &Apache::lonhtmlcommon::add_breadcrumb
             ({href=>'/adm/dropadd?action=drop',
               text=>"Drop Students"});
-        $r->print(&Apache::lonhtmlcommon::breadcrumbs
-                  (undef,'Drop Students','Course_Drop_Student'));
+        $r->print(&Apache::lonhtmlcommon::breadcrumbs('Drop Students',
+						      'Course_Drop_Student'));
         if (! exists($env{'form.state'})) {
             &print_drop_menu($r);
         } elsif ($env{'form.state'} eq 'done') {
@@ -2351,8 +2522,8 @@ sub handler {
         &Apache::lonhtmlcommon::add_breadcrumb
             ({href=>'/adm/dropadd?action=enrollstudent',
               text=>"Enroll Student"});
-        $r->print(&Apache::lonhtmlcommon::breadcrumbs
-                  (undef,'Enroll Student','Course_Add_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') {
@@ -2366,8 +2537,8 @@ sub handler {
         &Apache::lonhtmlcommon::add_breadcrumb
             ({href=>'/adm/dropadd?action=classlist',
               text=>"View Classlist"});
-        $r->print(&Apache::lonhtmlcommon::breadcrumbs
-                  (undef,'View Classlist','Course_View_Class_List'));
+        $r->print(&Apache::lonhtmlcommon::breadcrumbs('View Classlist',
+						      'Course_View_Class_List'));
         if (! exists($env{'form.state'})) {
             &print_html_classlist($r,undef);
         } elsif ($env{'form.state'} eq 'csv') {
@@ -2381,8 +2552,8 @@ sub handler {
         &Apache::lonhtmlcommon::add_breadcrumb
             ({href=>'/adm/dropadd?action=modifystudent',
               text=>"Modify Student Data"});
-        $r->print(&Apache::lonhtmlcommon::breadcrumbs
-                  (undef,'Modify Student Data','Course_Modify_Student_Data'));
+        $r->print(&Apache::lonhtmlcommon::breadcrumbs('Modify Student Data',
+						      'Course_Modify_Student_Data'));
         if (! exists($env{'form.state'})) {
             &print_html_classlist($r);
         } elsif ($env{'form.state'} eq 'selected') {
@@ -2397,13 +2568,12 @@ sub handler {
         &Apache::lonnet::logthis("Undetermined state in londropadd.pm.  ".
                                  "form.action = ".$env{'form.action'}.
                                  "Someone should fix this.");
-        $r->print(&Apache::lonhtmlcommon::breadcrumbs
-                  (undef,'Enrollment Manager'));
+        $r->print(&Apache::lonhtmlcommon::breadcrumbs('Enrollment Manager'));
         &print_main_menu($r,$enrl_permission,$view_permission);
     }
     #
     # Finish up
-    $r->print('</form></body></html>');
+    $r->print('</form>'.&Apache::loncommon::end_page());
     return OK;
 }
 

$lt{'end'} +	+ $lt{'grp'}
'."\n".' '. + ''. + $photo_options{$photochg}.' '.$lt{'photo'}."\n". + '
$section	$start	$end
$active_groups