--- loncom/interface/Attic/londropadd.pm	2003/02/13 21:35:50	1.64
+++ loncom/interface/Attic/londropadd.pm	2003/06/20 18:34:52	1.67
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to drop and add students in courses 
 #
-# $Id: londropadd.pm,v 1.64 2003/02/13 21:35:50 albertel Exp $
+# $Id: londropadd.pm,v 1.67 2003/06/20 18:34:52 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -213,6 +213,7 @@ sub javascript_validations {
     my %param = ( formname => 'studentform',
                   kerb_def_dom => $krbdefdom );
     my $authheader = &Apache::loncommon::authform_header(%param);
+    my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition();
     return (<<ENDPICK);
 function verify_message (vf,founduname,foundpwd,foundname,foundid,foundsec) {
     var foundatype=0;
@@ -286,14 +287,7 @@ function verify_message (vf,founduname,f
         parmwin.close();
     }
 
-    function pjump(type,dis,value,marker,ret,call) {
-        parmwin=window.open("/adm/rat/parameter.html?type="+escape(type)
-                 +"&value="+escape(value)+"&marker="+escape(marker)
-                 +"&return="+escape(ret)
-                 +"&call="+escape(call)+"&name="+escape(dis),"LONCAPAparms",
-                 "height=350,width=350,scrollbars=no,menubar=no");
-
-    }
+    $pjump_def
 
     function dateset() {
         if (document.studentform.pres_marker.value=='end') {
@@ -605,13 +599,19 @@ sub enroll_single_student {
             &modifystudent($ENV{'form.lcdomain'},$ENV{'form.cuname'},
                            $ENV{'request.course.id'},$ENV{'form.csec'},
                             $desiredhost);
+            my $startdate = 
+                &Apache::lonhtmlcommon::get_date_from_form('startdate');
+            my $enddate   = 
+                &Apache::lonhtmlcommon::get_date_from_form('enddate');
+            &Apache::lonnet::logthis('startdate = '.$startdate);
+            &Apache::lonnet::logthis('enddate = '.$enddate);
             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'},
+                 $ENV{'form.csec'},$enddate,
+                 $startdate,$ENV{'form.forceid'},
                  $desiredhost);
             if ($login_result =~ /^ok/) {
                 $r->print($login_result);
@@ -650,6 +650,24 @@ sub print_enroll_single_student_form {
     my $locform = &Apache::loncommon::authform_local(%param);
     # Set up domain selection form
     my $domform = &domain_form($defdom);
+    my $starttime = 'now';
+    if (exists($ENV{'course.'.$ENV{'request.course.id'}.
+                        '.default_enrollment_start_date'})) {
+        $starttime = $ENV{'course.'.$ENV{'request.course.id'}.
+                              '.default_enrollment_start_date'};
+    }
+    my $endtime = time+(6*30*24*60*60); # 6 months from now, approx
+    if (exists($ENV{'course.'.$ENV{'request.course.id'}.
+                        '.default_enrollment_end_date'})) {
+        $endtime = $ENV{'course.'.$ENV{'request.course.id'}.
+                            '.default_enrollment_end_date'};
+    }
+    my $startdateform = &Apache::lonhtmlcommon::date_setter('studentform',
+                                                            'startdate',
+                                                            $starttime);
+    my $enddateform = &Apache::lonhtmlcommon::date_setter('studentform',
+                                                          'enddate',
+                                                          $endtime);
     # Print it all out
     $r->print(<<END);
 <input type="hidden" name="action" value="enrollstudent">
@@ -722,13 +740,10 @@ $locform
 <input type="hidden" name="startdate"   value='$today'    />
 <input type="hidden" name="enddate"     value='$halfyear' />
 </p><p>
-<a 
- href="javascript:pjump('date_start','Enrollment Starting Date',document.studentform.startdate.value,'start','studentform.pres','dateset');"
->Set Starting Date</a>
-</p><p>
-<a 
- href="javascript:pjump('date_end','Enrollment Ending Date',document.studentform.enddate.value,'end','studentform.pres','dateset');"
->Set Ending Date</a>
+<table>
+<tr><td align="right" ><b>Starting Date</b></td><td>$startdateform</td></tr>
+<tr><td align="right" ><b>Ending Date</b></td><td>$enddateform</td></tr>
+</table>
 </p>
 <h3>ID/Student Number</h3>
 <p>
@@ -1086,10 +1101,8 @@ sub modify_single_student {
     my $section    = $ENV{'form.section'};
     my $courseid   = $ENV{'request.course.id'};
     my $sid        = $ENV{'form.id'};
-    my $starttime = &Apache::lonhtmlcommon::get_date_from_form('startdate',
-                                                               time);
-    my $endtime   = &Apache::lonhtmlcommon::get_date_from_form('enddate',
-                                                               time);
+    my $starttime = &Apache::lonhtmlcommon::get_date_from_form('startdate');
+    my $endtime   = &Apache::lonhtmlcommon::get_date_from_form('enddate');
     my $displayable_starttime = localtime($starttime);
     my $displayable_endtime   = localtime($endtime);
     #