--- loncom/interface/Attic/londropadd.pm	2003/11/06 22:49:59	1.89
+++ loncom/interface/Attic/londropadd.pm	2004/01/21 00:29:56	1.91.2.2
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to drop and add students in courses 
 #
-# $Id: londropadd.pm,v 1.89 2003/11/06 22:49:59 matthew Exp $
+# $Id: londropadd.pm,v 1.91.2.2 2004/01/21 00:29:56 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -43,6 +43,7 @@ use Apache::lonhtmlcommon();
 use Apache::Constants qw(:common :http REDIRECT);
 use Spreadsheet::WriteExcel;
 use Apache::lonlocal;
+use localenroll();
 
 ###############################################################
 ###############################################################
@@ -146,7 +147,8 @@ sub print_main_menu {
          'enrollone' => 'Enroll a single student',
          'modify'    => 'Modify student data',
          'view'      => 'View Class List',
-         'drop'      => 'Drop Students');
+         'drop'      => 'Drop Students',
+         'populate'  => 'Automated Enrollment Manager');
 
     $r->print(<<END);
 <p>
@@ -169,8 +171,15 @@ sub print_main_menu {
 <font size="+1">
     <a href="/adm/dropadd?action=drop">$Text{'drop'}</a>
 </font>
-</p>
+</p><p>
+END
+    if (&localenroll::run() ) {
+	$r->print(<<END);
+<font size="+1">
+    <a href="/adm/populate">$Text{'populate'}</a>
+</font>
 END
+    }
 }
 
 ###############################################################
@@ -231,13 +240,26 @@ sub print_upload_manager_header {
 ###############################################################
 ###############################################################
 sub javascript_validations {
-    my ($mode,$krbdefdom)=@_;
+    my ($mode,$krbdefdom,$curr_authtype,$curr_authfield)=@_;
     my $authheader;
     if ($mode eq 'auth') {
         my %param = ( formname => 'studentform',
                       kerb_def_dom => $krbdefdom );
         $authheader = &Apache::loncommon::authform_header(%param);
+    } elsif ($mode eq 'createcourse') {
+        my %param = ( formname => 'ccrs',
+                  kerb_def_dom => $krbdefdom );
+        $authheader = &Apache::loncommon::authform_header(%param);
+    } elsif ($mode eq 'modifycourse') {
+        my %param = ( formname => 'cmod',
+                  kerb_def_dom => $krbdefdom,
+                  mode => 'modifycourse',
+                  curr_authtype => $curr_authtype,
+                  curr_autharg => $curr_authfield );
+        $authheader = &Apache::loncommon::authform_header(%param);
     }
+
+    
     my %alert = &Apache::lonlocal::texthash
         (username => 'You need to specify the username field.',
          authen   => 'You must choose an authentication type.',
@@ -254,7 +276,18 @@ sub javascript_validations {
     my $function_name =(<<END);
 function verify_message (vf,founduname,foundpwd,foundname,foundid,foundsec,foundemail) {
 END
-    my $auth_checks = (<<END);
+    my $auth_checks;
+    if ($mode eq 'createcourse') {
+        $auth_checks .= (<<END);
+    if (vf.autoadds[0].checked == true) {
+        if (current.radiovalue == null || current.radiovalue == 'nochange') {
+            alert('$alert{'authen'}');
+            return;
+        }
+    }
+END
+    } else {
+        $auth_checks .= (<<END);
     var foundatype=0;
     if (founduname==0) {
 	alert('$alert{'username'}');
@@ -266,6 +299,36 @@ END
         alert('$alert{'authen'}');
         return;
     }
+END
+    }
+    if ($mode eq 'createcourse') {
+        $auth_checks .= "
+    if ( (vf.autoadds[0].checked == true) &&
+         (vf.elements[current.argfield].value == null || vf.elements[current.argfield].value == '') ) {
+";
+    } elsif ($mode eq 'modifycourse') {
+        $auth_checks .= " 
+    if (vf.elements[current.argfield].value == null || vf.elements[current.argfield].value == '') {
+";
+    }
+    if ( ($mode eq 'createcourse') || ($mode eq 'modifycourse') ) {
+        $auth_checks .= (<<END);
+        var alertmsg = '';
+        switch (current.radiovalue) {
+            case 'krb':
+                alertmsg = '$alert{'krb'}';
+                break;
+            default:
+                alertmsg = '';
+        }
+        if (alertmsg != '') {
+            alert(alertmsg);
+            return;
+        }
+    }
+END
+    } else {
+        $auth_checks .= (<<END);
     foundatype=1;
     if (current.argfield == null || current.argfield == '') {
         var alertmsg = '';
@@ -289,7 +352,15 @@ END
         }
     }
 END
-    my $optional_checks = (<<END);
+    }
+    my $optional_checks = '';
+    if ( ($mode eq 'createcourse') || ($mode eq 'modifycourse') ) {
+        $optional_checks = (<<END);
+    vf.submit();
+}
+END
+    } else {
+        $optional_checks = (<<END);
     var message='';
     if (foundname==0) { 
         message='$alert{'name'}';
@@ -323,14 +394,14 @@ END
         vf.submit();
     }
 }
-
 END
+    }
     my $result = $function_name;
-    if ($mode eq 'auth') {
+    if ( ($mode eq 'auth') || ($mode eq 'createcourse') || ($mode eq 'modifycourse')  ) {
         $result .= $auth_checks;
     }
     $result .= $optional_checks;
-    if ($mode eq 'auth') {
+    if ( ($mode eq 'auth') || ($mode eq 'createcourse') || ($mode eq 'modifycourse')  ) {
         $result .= $authheader;
     }
     return $result;
@@ -500,52 +571,53 @@ sub print_upload_manager_footer {
     my $locform = &Apache::loncommon::authform_local(%param);
     my $domform = &domain_form($defdom);
     my $date_table = &date_setting_table();
-    $r->print(<<ENDPICK);
-</table>
-<input type="hidden" name="nfields" value="$i">
-<input type="hidden" name="keyfields" value="$keyfields">
-<h3>Login Type</h3>
-<p>Note: this will not take effect if the user already exists</p>
-<p>
-$krbform
-</p>
-<p>
-$intform
-</p>
-<p>
-$locform
-</p>
-<h3>LON-CAPA Domain for Students</h3>
-LON-CAPA domain: $domform <p>
-<h3>Starting and Ending Dates</h3>
-<p>
-$date_table
-</p>
-<h3>Full Update</h3>
-<input type=checkbox name=fullup value=yes> Full update 
-(also print list of users not enrolled anymore)<p>
-<h3>ID/Student Number</h3>
-<input type=checkbox name=forceid value=yes> 
-Disable ID/Student Number Safeguard and Force Change of Conflicting IDs
-(only do if you know what you are doing)<p>
-<input type="button" onClick="javascript:verify(this.form)" value="Update Courselist" /><br />
-Note: for large courses, this operation may be time consuming.
-ENDPICK
+    my $Str = "</table>\n";
+    $Str .= &hidden_input('nfields',$i);
+    $Str .= &hidden_input('keyfields',$keyfields);
+    $Str .= '<h3>'.&mt('Login Type')."</h3>\n";
+    $Str .= "<p>\n".
+        &mt('Note: this will not take effect if the user already exists').
+        "</p><p>\n";
+    $Str .= $krbform."\n</p><p>\n".
+        $intform."\n</p><p>\n".
+        $locform."\n</p>\n";
+    $Str .= '<h3>'.&mt('LON-CAPA Domain for Students')."</h3>\n";
+    $Str .= "<p>\n".&mt('LON-CAPA domain: [_1]',$domform)."\n</p>\n";
+    $Str .= "<h3>".&mt('Starting and Ending Dates')."</h3>\n";
+    $Str .= "<p>\n".$date_table."</p>\n";
+    $Str .= "<h3>".&mt('Full Update')."</h3>\n";
+    $Str .= '<input type="checkbox" name="fullup" value="yes">'.
+        ' '.&mt('Full update (also print list of users not enrolled anymore)').
+        "</p>\n";
+    $Str .= "<h3>".&mt('Student Number')."</h3>\n";
+    $Str .= "<p>\n".'<input type="checkbox" name="forceid" value="yes">';
+    $Str .= &mt('Disable ID/Student Number Safeguard and Force Change '.
+                'of Conflicting IDs (only do if you know what you are doing)').
+                "\n</p><p>\n";
+    $Str .= '<input type="button" onClick="javascript:verify(this.form)" '.
+        'value="Update Courselist" />'."<br />\n";
+    $Str .= &mt('Note: for large courses, this operation may be time '.
+                'consuming');
+    $r->print($Str);
+    return;
 }
 
-# ======================================================= Menu Phase Two Upload
+###############################################################
+###############################################################
 sub print_upload_manager_form {
     my $r=shift;
     my $firstLine;
     my $datatoken;
     if (!$ENV{'form.datatoken'}) {
-      $datatoken=&Apache::loncommon::upfile_store($r);
+        $datatoken=&Apache::loncommon::upfile_store($r);
     } else {
-      $datatoken=$ENV{'form.datatoken'};
-      &Apache::loncommon::load_tmp_file($r);
+        $datatoken=$ENV{'form.datatoken'};
+        &Apache::loncommon::load_tmp_file($r);
     }
     my @records=&Apache::loncommon::upfile_record_sep();
-    if($ENV{'form.noFirstLine'}){$firstLine=shift(@records);}
+    if($ENV{'form.noFirstLine'}){
+        $firstLine=shift(@records);
+    }
     my $total=$#records;
     my $distotal=$total+1;
     my $today=time;
@@ -557,24 +629,28 @@ sub print_upload_manager_form {
     my $i;
     my $keyfields;
     if ($total>=0) {
-	my @d=(['username','Username'],
-               ['names','Last Name, First Names'],
-	       ['fname','First Name'],
-               ['mname','Middle Names/Initials'],
-	       ['lname','Last Name'],
-               ['gen','Generation'],
-	       ['id','ID/Student Number'],
-               ['sec','Group/Section'],
-	       ['ipwd','Initial Password'],
-               ['email','EMail Address']);
+        my @field=(['username',&mt('Username')],
+                   ['names',&mt('Last Name, First Names')],
+                   ['fname',&mt('First Name')],
+                   ['mname',&mt('Middle Names/Initials')],
+                   ['lname',&mt('Last Name')],
+                   ['gen',&mt('Generation')],
+                   ['id',&mt('ID/Student Number')],
+                   ['sec',&mt('Group/Section')],
+                   ['ipwd',&mt('Initial Password')],
+                   ['email',&mt('EMail Address')]);
 	if ($ENV{'form.upfile_associate'} eq 'reverse') {	
 	    &Apache::loncommon::csv_print_samples($r,\@records);
-	    $i=&Apache::loncommon::csv_print_select_table($r,\@records,\@d);
-	    foreach (@d) { $keyfields.=$_->[0].','; }
+	    $i=&Apache::loncommon::csv_print_select_table($r,\@records,
+                                                          \@field);
+	    foreach (@field) { 
+                $keyfields.=$_->[0].','; 
+            }
 	    chop($keyfields);
 	} else {
-	    unshift(@d,['none','']);
-	    $i=&Apache::loncommon::csv_samples_select_table($r,\@records,\@d);
+	    unshift(@field,['none','']);
+	    $i=&Apache::loncommon::csv_samples_select_table($r,\@records,
+                                                            \@field);
 	    my %sone=&Apache::loncommon::record_sep($records[0]);
 	    $keyfields=join(',',sort(keys(%sone)));
 	}
@@ -582,7 +658,8 @@ sub print_upload_manager_form {
     &print_upload_manager_footer($r,$i,$keyfields,$defdom,$today,$halfyear);
 }
 
-# ======================================================= Enroll single student
+###############################################################
+###############################################################
 sub enroll_single_student {
     my $r=shift;
     # Remove non alphanumeric values from section
@@ -668,21 +745,25 @@ sub enroll_single_student {
 }
 
 sub setup_date_selectors {
-    my ($starttime,$endtime) = @_;
+    my ($starttime,$endtime,$mode) = @_;
     if (! defined($starttime)) {
         $starttime = time;
-        if (exists($ENV{'course.'.$ENV{'request.course.id'}.
+        unless ($mode eq 'createcourse') {
+            if (exists($ENV{'course.'.$ENV{'request.course.id'}.
                             '.default_enrollment_start_date'})) {
-            $starttime = $ENV{'course.'.$ENV{'request.course.id'}.
+                $starttime = $ENV{'course.'.$ENV{'request.course.id'}.
                                   '.default_enrollment_start_date'};
+            }
         }
     }
     if (! defined($endtime)) {
         $endtime = time+(6*30*24*60*60); # 6 months from now, approx
-        if (exists($ENV{'course.'.$ENV{'request.course.id'}.
+        unless ($mode eq 'createcourse') {
+            if (exists($ENV{'course.'.$ENV{'request.course.id'}.
                             '.default_enrollment_end_date'})) {
-            $endtime = $ENV{'course.'.$ENV{'request.course.id'}.
+                $endtime = $ENV{'course.'.$ENV{'request.course.id'}.
                                 '.default_enrollment_end_date'};
+            }
         }
     }
     my $startdateform = &Apache::lonhtmlcommon::date_setter('studentform',
@@ -691,6 +772,14 @@ sub setup_date_selectors {
     my $enddateform = &Apache::lonhtmlcommon::date_setter('studentform',
                                                           'enddate',
                                                           $endtime);
+    if ($mode eq 'createcourse') {
+        $startdateform = &Apache::lonhtmlcommon::date_setter('ccrs',
+                                                            'startdate',
+                                                            $starttime);
+        $enddateform = &Apache::lonhtmlcommon::date_setter('ccrs',
+                                                          'enddate',
+                                                          $endtime);
+    }
     return ($startdateform,$enddateform);
 }
 
@@ -704,11 +793,14 @@ sub get_dates_from_form {
 }
 
 sub date_setting_table {
-    my ($starttime,$endtime) = @_;
-    my ($startform,$endform)=&setup_date_selectors($starttime,$endtime);
+    my ($starttime,$endtime,$mode) = @_;
+    my ($startform,$endform)=&setup_date_selectors($starttime,$endtime,$mode);
     my $dateDefault = '<nobr>'.
         '<input type="checkbox" name="makedatesdefault" />'.
         ' make these dates the default for future enrollment';
+    if ($mode eq 'createcourse') {
+        $dateDefault = '&nbsp;';
+    }
     my $perpetual = '<nobr><input type="checkbox" name="no_end_date"';
     if (defined($endtime) && $endtime == 0) {
         $perpetual .= ' checked';