--- loncom/interface/Attic/londropadd.pm	2004/06/09 17:08:27	1.113
+++ loncom/interface/Attic/londropadd.pm	2004/06/17 18:31:24	1.114
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to drop and add students in courses 
 #
-# $Id: londropadd.pm,v 1.113 2004/06/09 17:08:27 raeburn Exp $
+# $Id: londropadd.pm,v 1.114 2004/06/17 18:31:24 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -786,7 +786,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'}.
@@ -810,12 +810,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);
@@ -836,7 +844,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"';
@@ -844,6 +852,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>'.
@@ -1195,16 +1206,19 @@ sub show_class_list {
     my ($CSVfile,$CSVfilename);
     #
     my $sortby = $ENV{'form.sortby'};
-    if ($sortby !~ /^(username|domain|section|fullname|id|start|end)$/) {
+    if ($sortby !~ /^(username|domain|section|fullname|id|start|end|type)$/) {
         $sortby = 'username';
     }
     # Print out header 
-    $r->print(<<END);
-
+    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" />
 END
-    if ($mode eq 'html' || $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') {
@@ -1217,10 +1231,16 @@ END
                                            'sec'    => "section",
                                            'start'  => "start date",
                                            'end'    => "end date",
+                                           'type'   => "enroll type",
+                                           'chan'   => "change"
 					   );
-        $r->print(<<END);
+        unless ($mode eq 'autoenroll') {
+            $r->print(<<END);
 <input type="hidden" name="sname"  value="" />
 <input type="hidden" name="sdom"   value="" />
+END
+        }
+        $r->print(<<END);
 <p>
 <table border=2>
 <tr><th>Count
@@ -1239,8 +1259,16 @@ END
     </th><th>
        <a href="javascript:document.studentform.sortby.value='end';document.studentform.submit();">$lt{'end'}</a>
     </th>
-</tr>
 END
+        if ($mode eq 'autoenroll') {
+            $r->print("   <th>
+       <a href=\"javascript:document.studentform.sortby.value='type';document.studentform.submit();\">$lt{'type'}</a>
+    </th><th>
+         $lt{'chan'}?</th>");
+        }
+        $r->print("
+   </tr>
+        ");
     } elsif ($mode eq 'csv') {
 	#
 	# Open a file
@@ -1319,10 +1347,19 @@ END
         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' || $mode eq 'html') {
-            $start = &Apache::lonlocal::locallocaltime($start);
-            $end   = &Apache::lonlocal::locallocaltime($end);
+        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    <td>".(++$studentcount)."</td><td>\n    ");
             if ($linkto eq 'nothing') {
                 $r->print($username);
@@ -1347,13 +1384,30 @@ END
     <td>$section</td>
     <td>$start</td>
     <td>$end</td>
-</tr>
 END
+            if ($mode eq 'autoenroll') {
+                my $longtype = &mt('manual').'&nbsp';
+                if ($type eq 'auto') {
+                    $longtype = &mt('auto').'&nbsp';
+                }
+                $r->print("<td><b>$longtype</b></td><td><input type=\"checkbox\" name=\"switch:$username:$domain\" /></td>");
+            }
+            $r->print("
+</tr>
+            ");
         } elsif ($mode eq 'csv') {
             next if (! defined($CSVfile));
             # no need to bother with $linkto
-            $start = &Apache::lonlocal::locallocaltime($start);
-            $end   = &Apache::lonlocal::locallocaltime($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 @line = ();
             foreach ($username,$domain,$id,$name,$section,$start,$end) {
                 push @line,&Apache::loncommon::csv_translate($_);
@@ -1375,7 +1429,7 @@ END
             $row++;
         }
     }
-    if ($mode eq 'view' || $mode eq 'html') {
+    if ($mode eq 'view' || $mode eq 'html' || $mode eq 'autoenroll') {
         $r->print('</table><br>');
     } elsif ($mode eq 'excel') {
         $excel_workbook->close();
@@ -1388,6 +1442,9 @@ END
                   "\n");
         $r->rflush();
     }
+    if ($mode eq 'autoenroll') {
+        return $studentcount;
+    }
 }