--- loncom/interface/Attic/londropadd.pm	2004/03/17 19:56:47	1.108
+++ loncom/interface/Attic/londropadd.pm	2004/12/02 19:00:38	1.122
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to drop and add students in courses 
 #
-# $Id: londropadd.pm,v 1.108 2004/03/17 19:56:47 matthew Exp $
+# $Id: londropadd.pm,v 1.122 2004/12/02 19:00:38 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -37,6 +37,7 @@ use Apache::loncommon();
 use Apache::lonhtmlcommon();
 use Apache::Constants qw(:common :http REDIRECT);
 use Spreadsheet::WriteExcel;
+use Apache::lonstathelpers();
 use Apache::lonlocal;
 
 ###############################################################
@@ -135,47 +136,61 @@ sub domain_form {
 ###############################################################
 #  Menu Phase One
 sub print_main_menu {
-    my $r=shift;
-    my %Text = &Apache::lonlocal::texthash
-        ('upload'    => 'Upload a class list',
-         'enrollone' => 'Enroll a single student',
-         'modify'    => 'Modify student data',
-         'view'      => 'View Class List',
-         'drop'      => 'Drop Students',
-         'populate'  => 'Automated Enrollment Manager');
-    my %help=();
-    foreach ('Course_Drop_Student','Course_Add_Student',
-	     'Course_Modify_Student_Data','Course_View_Class_List',
-	     'Course_Create_Class_List') {
-	$help{$_}=&Apache::loncommon::help_open_topic($_);
+    my ($r,$enrl_permission,$view_permission)=@_;
+    #
+    my ($cdom,$cnum) = split/_/,$ENV{'request.course.id'};
+    my @menu = 
+        ( 
+          { text => 'Upload a class list', 
+            help => 'Course_Create_Class_List',
+            action => 'upload',
+            permission => $enrl_permission,
+            },
+          { text => 'Enroll a single student', 
+            help => 'Course_Add_Student',
+            action => 'enrollstudent',
+            permission => $enrl_permission,
+            },
+          { text => 'Modify student data', 
+            help => 'Course_Modify_Student_Data',
+            action => 'modifystudent',
+            permission => $enrl_permission,
+            },
+          { text => 'View Class List', 
+            help => 'Course_View_Class_List',
+            action => 'classlist',
+            permission => $view_permission,
+            },
+          { text => 'Drop Students', 
+            help => 'Course_Drop_Student',
+            action => 'drop',
+            permission => $enrl_permission,
+            },
+          { text => 'Automated Enrollment Manager', 
+            permission => &Apache::lonnet::auto_run($cnum,$cdom),
+            url  => '/adm/populate',
+            },
+          );
+    my $menu_html = '';
+    foreach my $menu_item (@menu) {
+        next if (! $menu_item->{'permission'});
+        $menu_html.='<p>';
+        $menu_html.='<font size="+1">';
+        if (exists($menu_item->{'url'})) {
+            $menu_html.=qq{<a href="$menu_item->{'url'}">};
+        } else {
+            $menu_html.=
+                qq{<a href="/adm/dropadd?action=$menu_item->{'action'}">};
+        }
+        $menu_html.= &mt($menu_item->{'text'}).'</a></font>';
+        if (exists($menu_item->{'help'})) {
+            $menu_html.=
+                &Apache::loncommon::help_open_topic($menu_item->{'help'});
+        }
+        $menu_html.='</p>'.$/;
     }
-
-    $r->print(<<END);
-<p>
-<font size="+1">
-<a href="/adm/dropadd?action=upload">$Text{'upload'}</a>
-</font>$help{'Course_Create_Class_List'}
-</p><p>
-<font size="+1">
-    <a href="/adm/dropadd?action=enrollstudent">$Text{'enrollone'}</a>
-    </font>$help{'Course_Add_Student'}
-</p><p>
-<font size="+1">
-    <a href="/adm/dropadd?action=modifystudent">$Text{'modify'}</a>
-    </font>$help{'Course_Modify_Student_Data'}
-</p><p>
-<font size="+1">
-    <a href="/adm/dropadd?action=classlist">$Text{'view'}</a>
-    </font>$help{'Course_View_Class_List'}
-</p><p>
-<font size="+1">
-    <a href="/adm/dropadd?action=drop">$Text{'drop'}</a>
-    </font>$help{'Course_Drop_Student'}
-</p><p>
-<font size="+1">
-    <a href="/adm/populate">$Text{'populate'}</a>
-</font>
-END
+    $r->print($menu_html);
+    return;
 }
 
 ###############################################################
@@ -303,7 +318,7 @@ END
         return;
     }
     // alert('current.radiovalue = '+current.radiovalue);
-    if (current.radiovalue == null || current.radiovalue == 'nochange') {
+    if (current.radiovalue == null || current.radiovalue == '' || current.radiovalue == 'nochange') {
         // They did not check any of the login radiobuttons.
         alert('$alert{'authen'}');
         return;
@@ -780,7 +795,7 @@ sub setup_date_selectors {
     my ($starttime,$endtime,$mode) = @_;
     if (! defined($starttime)) {
         $starttime = time;
-        unless ($mode eq 'createcourse') {
+        unless ($mode eq 'create_enrolldates' || $mode eq 'create_defaultdates') {
             if (exists($ENV{'course.'.$ENV{'request.course.id'}.
                             '.default_enrollment_start_date'})) {
                 $starttime = $ENV{'course.'.$ENV{'request.course.id'}.
@@ -804,12 +819,20 @@ sub setup_date_selectors {
     my $enddateform = &Apache::lonhtmlcommon::date_setter('studentform',
                                                           'enddate',
                                                           $endtime);
-    if ($mode eq 'createcourse') {
+    if ($mode eq 'create_enrolldates') {
         $startdateform = &Apache::lonhtmlcommon::date_setter('ccrs',
-                                                            'startdate',
+                                                            'startenroll',
                                                             $starttime);
         $enddateform = &Apache::lonhtmlcommon::date_setter('ccrs',
-                                                          'enddate',
+                                                          'endenroll',
+                                                          $endtime);
+    }
+    if ($mode eq 'create_defaultdates') {
+        $startdateform = &Apache::lonhtmlcommon::date_setter('ccrs',
+                                                            'startaccess',
+                                                            $starttime);
+        $enddateform = &Apache::lonhtmlcommon::date_setter('ccrs',
+                                                          'endaccess',
                                                           $endtime);
     }
     return ($startdateform,$enddateform);
@@ -830,7 +853,7 @@ sub date_setting_table {
     my $dateDefault = '<nobr>'.
         '<input type="checkbox" name="makedatesdefault" /> '.
         &mt('make these dates the default for future enrollment');
-    if ($mode eq 'createcourse') {
+    if ($mode eq 'create_enrolldates' || $mode eq 'create_defaultdates') {
         $dateDefault = '&nbsp;';
     }
     my $perpetual = '<nobr><input type="checkbox" name="no_end_date"';
@@ -838,6 +861,9 @@ sub date_setting_table {
         $perpetual .= ' checked';
     }
     $perpetual.= ' /> '.&mt('no ending date').'</nobr>';
+    if ($mode eq 'create_enrolldates') {
+        $perpetual = '&nbsp;';
+    }
     my $result = '';
     $result .= "<table>\n";
     $result .= '<tr><td align="right">'.&mt('Starting Date').'</td>'.
@@ -897,6 +923,10 @@ sub get_student_username_domain_form {
     <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
     return;
 }
@@ -907,6 +937,8 @@ sub print_enroll_single_student_form {
     #
     my $username = $ENV{'form.cuname'};
     my $domain   = $ENV{'form.cudomain'};
+    $username=~s/[\W|_]//gs;
+    $domain=~s/[\W|_]//gs;
     my $home = &Apache::lonnet::homeserver($username,$domain);
     # $new_user flags whether we are creating a new user or using an old one
     my $new_user = 1;
@@ -1115,21 +1147,28 @@ sub print_html_classlist {
     #
     # List course personnel
     my %coursepersonnel=&Apache::lonnet::get_course_adv_roles($cdom.'/'.$cnum);
+    #
+    if (! defined($ENV{'form.output'}) ||
+        $ENV{'form.output'} !~ /^(csv|excel|html)$/ ) {
+        $ENV{'form.output'} = 'html';
+    }
+    #
     $r->print('<br /><table border="2">');
-    foreach (sort keys %coursepersonnel) {
-	$r->print('<tr><td>'.$_.'</td><td>');
-        foreach (split(/\,/,$coursepersonnel{$_})) {
-	    my ($puname,$pudom)=split(/\:/,$_);
+    foreach my $role (sort keys %coursepersonnel) {
+        next if ($role =~ /^\s*$/);
+	$r->print('<tr><td>'.$role.'</td><td>');
+        foreach my $user (split(',',$coursepersonnel{$role})) {
+	    my ($puname,$pudom)=split(':',$user);
 	    $r->print(' '.&Apache::loncommon::aboutmewrapper(
-                          &Apache::loncommon::plainname($puname,
-                          $pudom),$puname,$pudom));
+                                    &Apache::loncommon::plainname($puname,
+                                                                  $pudom),
+                                                             $puname,$pudom));
 	}
         $r->print('</td></tr>');
     }
     $r->print('</table>');
     #
     # Interface output
-    my $CCL=&mt('Current Class List');
     $r->print('<input type="hidden" name="action" value="'.
               $ENV{'form.action'}.'" />');
     $r->print("<p>\n");
@@ -1137,14 +1176,10 @@ sub print_html_classlist {
 	my %lt=&Apache::lonlocal::texthash('csv' => "CSV",
                                            'excel' => "Excel",
                                            'html'  => 'HTML');
-        $r->print('<font size="+1">');
-        my $output_selector = '<select size="1" name="state" >';
-        if ($ENV{'form.state'} !~ /^(csv|excel|html)$/ ) {
-            $ENV{'form.state'} = 'html';
-        }
+        my $output_selector = '<select size="1" name="output" >';
         foreach my $outputformat ('html','csv','excel') {
             my $option = '<option value="'.$outputformat.'" ';
-            if ($outputformat eq $ENV{'form.state'}) {
+            if ($outputformat eq $ENV{'form.output'}) {
                 $option .= 'selected ';
             }
             $option .='>'.$lt{$outputformat}.'</option>';
@@ -1156,7 +1191,6 @@ sub print_html_classlist {
     $r->print(&mt('Student Status: [_1]',$status_select)."\n");
     $r->print('<input type="submit" value="'.&mt('Update Display').'" />'.
               "\n</p>\n");
-
     #
     # Print the classlist
     $r->print('<h2>'.&mt('Current Class List').'</h2>');
@@ -1166,13 +1200,10 @@ sub print_html_classlist {
     } else {
         # Print out the available choices
         if ($ENV{'form.action'} eq 'modifystudent') {
-            &show_class_list($r,'view','modify','modifystudent',
+            &show_class_list($r,'view','modify',
                              $ENV{'form.Status'},$classlist,$keylist);
-        } elsif (! defined($mode) || $mode eq '') {
-            &show_class_list($r,'view','aboutme','classlist',
-                             $ENV{'form.Status'},$classlist,$keylist);
-        } elsif ($mode eq 'csv' || $mode eq 'excel') {
-            &show_class_list($r,$mode,'nolink','csv',
+        } else {
+            &show_class_list($r,$ENV{'form.output'},'aboutme',
                              $ENV{'form.Status'},$classlist,$keylist);
         }
     }
@@ -1180,7 +1211,7 @@ sub print_html_classlist {
 
 # =================================================== Show student list to drop
 sub show_class_list {
-    my ($r,$mode,$linkto,$action,$statusmode,$classlist,$keylist)=@_;
+    my ($r,$mode,$linkto,$statusmode,$classlist,$keylist)=@_;
     my $cid=$ENV{'request.course.id'};
     #
     # Variables for excel output
@@ -1190,36 +1221,55 @@ sub show_class_list {
     my ($CSVfile,$CSVfilename);
     #
     my $sortby = $ENV{'form.sortby'};
-    if ($sortby !~ /^(username|domain|section|fullname|id)$/) {
+    if ($sortby !~ /^(username|domain|section|fullname|id|start|end|type)$/) {
         $sortby = 'username';
     }
     # Print out header 
+    unless ($mode eq 'autoenroll') {
+        $r->print(<<END);
+<input type="hidden" name="state" value="$ENV{'form.state'}" />
+END
+    }
     $r->print(<<END);
 <input type="hidden" name="sortby" value="$sortby" />
-<input type="hidden" name="sname"  value="" />
-<input type="hidden" name="sdom"   value="" />
 END
-    if ($mode eq 'view') {
+    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.'));
         } elsif ($linkto eq 'modify') {
             $r->print(&mt('Select a user name to modify the students information'));
         }
 	my %lt=&Apache::lonlocal::texthash(
-	               'usrn'   => "username",
-                       'dom'    => "domain",
-                       'sn'     => "student name",
-                       'sec'    => "section",
+                                           'usrn'   => "username",
+                                           'dom'    => "domain",
+                                           'sn'     => "student name",
+                                           'sec'    => "section",
+                                           'start'  => "start date",
+                                           'end'    => "end date",
+                                           'type'   => "enroll type/action"
 					   );
-        $r->print(<<END);
-
-<input type="hidden" name="sortby" value="$sortby" />
+        unless ($mode eq 'autoenroll') {
+            $r->print(<<END);
 <input type="hidden" name="sname"  value="" />
 <input type="hidden" name="sdom"   value="" />
+END
+        }
+        $r->print("
 <p>
 <table border=2>
-<tr><th>Count
-    </th><th>
+<tr>
+        ");
+        if ($mode eq 'autoenroll') {
+            $r->print("
+ <th><a href=\"javascript:document.studentform.sortby.value='type';document.studentform.submit();\">$lt{'type'}</a></th>
+            ");
+        } else {
+            $r->print("
+<th>Count</th>
+            ");
+        }
+        $r->print(<<END);
+    <th>
        <a href="javascript:document.studentform.sortby.value='username';document.studentform.submit();">$lt{'usrn'}</a>
     </th><th>
        <a href="javascript:document.studentform.sortby.value='domain';document.studentform.submit();">$lt{'dom'}</a>
@@ -1229,8 +1279,12 @@ END
        <a href="javascript:document.studentform.sortby.value='fullname';document.studentform.submit();">$lt{'sn'}</a>
     </th><th>
        <a href="javascript:document.studentform.sortby.value='section';document.studentform.submit();">$lt{'sec'}</a>
+    </th><th>
+       <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>
-</tr>
+  </tr>
 END
     } elsif ($mode eq 'csv') {
 	#
@@ -1254,12 +1308,12 @@ END
             print $CSVfile '"'.join('","',map {
 		&Apache::loncommon::csv_translate(&mt($_))
                 } ("username","domain","ID","student name",
-                   "section","status")).'"'."\n";
+                   "section","start date","end date","status")).'"'."\n";
         } else {
             print $CSVfile '"'.join('","',map {
 		&Apache::loncommon::csv_translate(&mt($_))
                 } ("username","domain","ID","student name",
-                   "section")).'"'."\n";
+                   "section","start date","end date")).'"'."\n";
         }
     } elsif ($mode eq 'excel') {
         # Create the excel spreadsheet
@@ -1278,7 +1332,9 @@ END
         $excel_sheet->write($row++,0,$description,$format->{'h1'});
         #
         $excel_sheet->write($row++,0,["username","domain","ID",
-                                      "student name","section","status"],$format->{'bold'});
+                                      "student name","section",
+                                      "start date","end date","status"],
+                            $format->{'bold'});
     }
     #
     # Sort the students
@@ -1298,16 +1354,57 @@ END
         lc($classlist->{$a}->[$third]) cmp lc($classlist->{$b}->[$third])
         } (keys(%$classlist));
     my $studentcount = 0;
+    my $autocount = 0;
+    my $manualcount = 0;
+    my $unlockcount = 0;
+    my $lockcount = 0;
     foreach my $student (@Sorted_Students) {
-        my $username = $classlist->{$student}->[$index{'username'}];
-        my $domain   = $classlist->{$student}->[$index{'domain'}];
-        my $section  = $classlist->{$student}->[$index{'section'}];
-        my $name     = $classlist->{$student}->[$index{'fullname'}];
-        my $id       = $classlist->{$student}->[$index{'id'}];
-        my $status   = $classlist->{$student}->[$index{'status'}];
+        my $sdata = $classlist->{$student};
+        my $username = $sdata->[$index{'username'}];
+        my $domain   = $sdata->[$index{'domain'}];
+        my $section  = $sdata->[$index{'section'}];
+        my $name     = $sdata->[$index{'fullname'}];
+        my $id       = $sdata->[$index{'id'}];
+        my $status   = $sdata->[$index{'status'}];
+        my $start    = $sdata->[$index{'start'}];
+        my $end      = $sdata->[$index{'end'}];
+        my $type     = $sdata->[$index{'type'}];
         next if (($statusmode ne 'Any') && ($status ne $statusmode));
-        if ($mode eq 'view') {
-            $r->print("<tr>\n    <td>".(++$studentcount)."</td><td>\n    ");
+        if ($mode eq 'view' || $mode eq 'html' || $mode eq 'autoenroll') {
+            if (! defined($start) || $start == 0) {
+                $start = &mt('none');
+            } else {
+                $start = &Apache::lonlocal::locallocaltime($start);
+            }
+            if (! defined($end) || $end == 0) {
+                $end = &mt('none');
+            } else {
+                $end = &Apache::lonlocal::locallocaltime($end);
+            }
+            $r->print("<tr>\n    ");
+            if ($mode eq 'autoenroll') {
+                my $lockedtype = $sdata->[$index{'lockedtype'}];
+                $studentcount++;
+                my $cellentry;
+                if ($type eq 'auto') {
+                    $cellentry = '<b>'.&mt('auto').'</b>&nbsp;<input type="checkbox" name="chgauto" value="'.$username.':'.$domain.'" />&nbsp;Change';
+                    $autocount ++;
+                } else {
+                    $cellentry = '<table border="0" cellspacing="0"><tr><td rowspan="2"><b>'.&mt('manual').'</b></td><td><nobr><input type="checkbox" name="chgmanual" value="'.$username.':'.$domain.'" />&nbsp;Change</nobr></td></tr><tr><td><nobr>';
+                    $manualcount ++;
+                    if ($lockedtype) {
+                        $cellentry .= '<input type="checkbox" name="unlockchg" value="'.$username.':'.$domain.'" />&nbsp;'.&mt('Unlock');
+                        $unlockcount ++;
+                    } else {
+                        $cellentry .= '<input type="checkbox" name="lockchg" value="'.$username.':'.$domain.'" />&nbsp;'.&mt('Lock');
+                        $lockcount ++;
+                    }
+                    $cellentry .= '</nobr></td></tr></table>';
+                }
+                $r->print("<td>$cellentry<td>\n    ");
+            } else {
+                $r->print("<td>".(++$studentcount)."</td><td>\n    ");
+            }
             if ($linkto eq 'nothing') {
                 $r->print($username);
             } elsif ($linkto eq 'aboutme') {
@@ -1329,13 +1426,25 @@ END
     <td>$id</td>
     <td>$name</td>
     <td>$section</td>
-</tr>
+    <td>$start</td>
+    <td>$end</td>
+   </tr>
 END
         } elsif ($mode eq 'csv') {
             next if (! defined($CSVfile));
             # no need to bother with $linkto
+            if (! defined($start) || $start == 0) {
+                $start = &mt('none');
+            } else {
+                $start = &Apache::lonlocal::locallocaltime($start);
+            }
+            if (! defined($end) || $end == 0) {
+                $end = &mt('none');
+            } else {
+                $end = &Apache::lonlocal::locallocaltime($end);
+            }
             my @line = ();
-            foreach ($username,$domain,$id,$name,$section) {
+            foreach ($username,$domain,$id,$name,$section,$start,$end) {
                 push @line,&Apache::loncommon::csv_translate($_);
             }
             if ($statusmode eq 'Any') {
@@ -1343,11 +1452,19 @@ END
             }
             print $CSVfile '"'.join('","',@line).'"'."\n";
         } elsif ($mode eq 'excel') {
-            $excel_sheet->write($row++,0,[$username,$domain,$id,
-                                          $name,$section,$status]);
+            $excel_sheet->write($row,0,[$username,$domain,$id,
+                                          $name,$section]);
+            my $col = 5;
+            foreach my $time ($start,$end) {
+                $excel_sheet->write($row,$col++,
+                                   &Apache::lonstathelpers::calc_serial($time),
+                                    $format->{'date'});
+            }
+            $excel_sheet->write($row,$col++,$status);
+            $row++;
         }
     }
-    if ($mode eq 'view') {
+    if ($mode eq 'view' || $mode eq 'html' || $mode eq 'autoenroll') {
         $r->print('</table><br>');
     } elsif ($mode eq 'excel') {
         $excel_workbook->close();
@@ -1360,6 +1477,10 @@ END
                   "\n");
         $r->rflush();
     }
+    if ($mode eq 'autoenroll') {
+        return ($studentcount,$autocount,$manualcount,$lockcount,$unlockcount);
+    }
+    return;
 }
 
 
@@ -1694,7 +1815,7 @@ sub show_drop_list {
                                                 ['sortby']);
     }
     my $sortby = $ENV{'form.sortby'};
-    if ($sortby !~ /^(username|domain|section|fullname|id)$/) {
+    if ($sortby !~ /^(username|domain|section|fullname|id|start|end)$/) {
         $sortby = 'username';
     }
     #
@@ -1718,13 +1839,14 @@ function uncheckAll(field) {
 <input type="hidden" name="phase" value="four">
 END
 
+my %lt=&Apache::lonlocal::texthash('usrn'   => "username",
+                                   'dom'    => "domain",
+                                   'sn'     => "student name",
+                                   'sec'    => "section",
+                                   'start'  => "start date",
+                                   'end'    => "end date",
+                                   );
     if ($nosort) {
-	my %lt=&Apache::lonlocal::texthash(
-	               'usrn'   => "username",
-                       'dom'    => "domain",
-                       'sn'     => "student name",
-                       'sec'    => "section",
-					   );
         $r->print(<<END);
 <table border=2>
 <tr>
@@ -1734,16 +1856,12 @@ END
     <th>ID</th>
     <th>$lt{'sn'}</th>
     <th>$lt{'sec'}</th>
+    <th>$lt{'start'}</th>
+    <th>$lt{'end'}</th>
 </tr>
 END
 
     } else  {
-	my %lt=&Apache::lonlocal::texthash(
-	               'usrn'   => "username",
-                       'dom'    => "domain",
-                       'sn'     => "student name",
-                       'sec'    => "section",
-					   );
         $r->print(<<END);
 <table border=2>
 <tr><th>&nbsp;</th>
@@ -1757,6 +1875,10 @@ END
        <a href="/adm/dropadd?action=$action&sortby=fullname">$lt{'sn'}</a>
     </th><th>
        <a href="/adm/dropadd?action=$action&sortby=section">$lt{'sec'}</a>
+    </th><th>
+       <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>
 </tr>
 END
@@ -1780,12 +1902,25 @@ END
         } (keys(%$classlist));
     foreach my $student (@Sorted_Students) {
         my $error;
-        my $username = $classlist->{$student}->[$index{'username'}];
-        my $domain   = $classlist->{$student}->[$index{'domain'}];
-        my $section  = $classlist->{$student}->[$index{'section'}];
-        my $name     = $classlist->{$student}->[$index{'fullname'}];
-        my $id       = $classlist->{$student}->[$index{'id'}];
-        my $status   = $classlist->{$student}->[$index{'status'}];
+        my $sdata = $classlist->{$student};
+        my $username = $sdata->[$index{'username'}];
+        my $domain   = $sdata->[$index{'domain'}];
+        my $section  = $sdata->[$index{'section'}];
+        my $name     = $sdata->[$index{'fullname'}];
+        my $id       = $sdata->[$index{'id'}];
+        my $start    = $sdata->[$index{'start'}];
+        my $end      = $sdata->[$index{'end'}];
+        if (! defined($start) || $start == 0) {
+            $start = &mt('none');
+        } else {
+            $start = &Apache::lonlocal::locallocaltime($start);
+        }
+        if (! defined($end) || $end == 0) {
+            $end = &mt('none');
+        } else {
+            $end = &Apache::lonlocal::locallocaltime($end);
+        }
+        my $status   = $sdata->[$index{'status'}];
         next if ($status ne 'Active');
         #
         $r->print(<<"END");
@@ -1796,11 +1931,13 @@ END
     <td>$id</td>
     <td>$name</td>
     <td>$section</td>
+    <td>$start</td>
+    <td>$end</td>
 </tr>
 END
     }
     $r->print('</table><br>');
-    my %lt=&Apache::lonlocal::texthash(
+    %lt=&Apache::lonlocal::texthash(
 	               'dp'   => "Drop Students",
                        'ca'   => "check all",
                        'ua'   => "uncheck all",
@@ -2140,14 +2277,23 @@ sub handler {
           text=>"Enrollment Manager",
           faq=>9,bug=>'Instructor Interface',});
     #  Needs to be in a course
-    if (! (($ENV{'request.course.fn'}) &&
-          (&Apache::lonnet::allowed('cst',$ENV{'request.course.id'})))) {
-        # Not in a course, or not allowed to modify parms
+    if (! ($ENV{'request.course.fn'})) {
+        # Not in a course
         $ENV{'user.error.msg'}=
             "/adm/dropadd:cst:0:0:Cannot drop or add students";
         return HTTP_NOT_ACCEPTABLE; 
     }
     #
+    my $view_permission = 
+        &Apache::lonnet::allowed('vcl',$ENV{'request.course.id'});
+    my $enrl_permission = 
+        &Apache::lonnet::allowed('cst',$ENV{'request.course.id'});
+    if (! $view_permission && ! $enrl_permission) {
+        $ENV{'user.error.msg'}=
+            "/adm/dropadd:cst:0:0:Cannot drop or add students";
+        return HTTP_NOT_ACCEPTABLE;        
+    }
+    #
     # Only output the header information if they did not request csv format
     #
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
@@ -2161,13 +2307,13 @@ sub handler {
     if (! exists($ENV{'form.action'})) {
         $r->print(&Apache::lonhtmlcommon::breadcrumbs
                   (undef,'Enrollment Manager'));
-        &print_main_menu($r);
-    } elsif ($ENV{'form.action'} eq 'upload') {
+        &print_main_menu($r,$enrl_permission,$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'));
+                  (undef,'Upload Classlist','Course_Create_Class_List'));
         if (! exists($ENV{'form.state'})) {
             &print_first_courselist_upload_form($r);            
         } elsif ($ENV{'form.state'} eq 'got_file') {
@@ -2181,12 +2327,12 @@ sub handler {
         } else {
             &print_first_courselist_upload_form($r);            
         }
-    } elsif ($ENV{'form.action'} eq 'drop') {
+    } elsif ($ENV{'form.action'} eq 'drop' && $enrl_permission) {
         &Apache::lonhtmlcommon::add_breadcrumb
             ({href=>'/adm/dropadd?action=drop',
               text=>"Drop Students"});
         $r->print(&Apache::lonhtmlcommon::breadcrumbs
-                  (undef,'Drop Students'));
+                  (undef,'Drop Students','Course_Drop_Student'));
         if (! exists($ENV{'form.state'})) {
             &print_drop_menu($r);
         } elsif ($ENV{'form.state'} eq 'done') {
@@ -2194,12 +2340,12 @@ sub handler {
         } else {
             &print_drop_menu($r);
         }
-    } elsif ($ENV{'form.action'} eq 'enrollstudent') {
+    } elsif ($ENV{'form.action'} eq 'enrollstudent' && $enrl_permission) {
         &Apache::lonhtmlcommon::add_breadcrumb
             ({href=>'/adm/dropadd?action=enrollstudent',
               text=>"Enroll Student"});
         $r->print(&Apache::lonhtmlcommon::breadcrumbs
-                  (undef,'Enroll Student'));
+                  (undef,'Enroll Student','Course_Add_Student'));
         if (! exists($ENV{'form.state'})) {
             &get_student_username_domain_form($r);
         } elsif ($ENV{'form.state'} eq 'gotusername') {
@@ -2209,12 +2355,12 @@ sub handler {
         } else {
             &get_student_username_domain_form($r);
         }
-    } elsif ($ENV{'form.action'} eq 'classlist') {
+    } elsif ($ENV{'form.action'} eq 'classlist' && $view_permission) {
         &Apache::lonhtmlcommon::add_breadcrumb
             ({href=>'/adm/dropadd?action=classlist',
               text=>"View Classlist"});
         $r->print(&Apache::lonhtmlcommon::breadcrumbs
-                  (undef,'View Classlist'));
+                  (undef,'View Classlist','Course_View_Class_List'));
         if (! exists($ENV{'form.state'})) {
             &print_html_classlist($r,undef);
         } elsif ($ENV{'form.state'} eq 'csv') {
@@ -2224,12 +2370,12 @@ sub handler {
         } else {
             &print_html_classlist($r,undef);
         }
-    } elsif ($ENV{'form.action'} eq 'modifystudent') {
+    } elsif ($ENV{'form.action'} eq 'modifystudent' && $enrl_permission) {
         &Apache::lonhtmlcommon::add_breadcrumb
             ({href=>'/adm/dropadd?action=modifystudent',
               text=>"Modify Student Data"});
         $r->print(&Apache::lonhtmlcommon::breadcrumbs
-                  (undef,'Modify Student Data'));
+                  (undef,'Modify Student Data','Course_Modify_Student_Data'));
         if (! exists($ENV{'form.state'})) {
             &print_html_classlist($r);
         } elsif ($ENV{'form.state'} eq 'selected') {
@@ -2246,7 +2392,7 @@ sub handler {
                                  "Someone should fix this.");
         $r->print(&Apache::lonhtmlcommon::breadcrumbs
                   (undef,'Enrollment Manager'));
-        &print_main_menu($r);
+        &print_main_menu($r,$enrl_permission,$view_permission);
     }
     #
     # Finish up