Diff for /loncom/interface/Attic/londropadd.pm between versions 1.60 and 1.67

version 1.60, 2002/11/08 20:51:48 version 1.67, 2003/06/20 18:34:52
Line 93  sub modifystudent { Line 93  sub modifystudent {
         }          }
     }      }
     if ($result eq '') {      if ($result eq '') {
         $result eq 'Unable to find section for this student';          $result = 'Unable to find section for this student';
     } else {      } else {
         $result =~ s/(ok:)+/ok/g;          $result =~ s/(ok:)+/ok/g;
     }      }
Line 213  sub javascript_validations { Line 213  sub javascript_validations {
     my %param = ( formname => 'studentform',      my %param = ( formname => 'studentform',
                   kerb_def_dom => $krbdefdom );                    kerb_def_dom => $krbdefdom );
     my $authheader = &Apache::loncommon::authform_header(%param);      my $authheader = &Apache::loncommon::authform_header(%param);
       my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition();
     return (<<ENDPICK);      return (<<ENDPICK);
 function verify_message (vf,founduname,foundpwd,foundname,foundid,foundsec) {  function verify_message (vf,founduname,foundpwd,foundname,foundid,foundsec) {
     var foundatype=0;      var foundatype=0;
Line 221  function verify_message (vf,founduname,f Line 222  function verify_message (vf,founduname,f
  alert('You need to specify the username field');   alert('You need to specify the username field');
         return;          return;
     }      }
       // alert('current.radiovalue = '+current.radiovalue);
     if (current.radiovalue == null || current.radiovalue == 'nochange') {      if (current.radiovalue == null || current.radiovalue == 'nochange') {
         // They did not check any of the login radiobuttons.          // They did not check any of the login radiobuttons.
         alert('You must choose an authentication type');          alert('You must choose an authentication type');
Line 285  function verify_message (vf,founduname,f Line 287  function verify_message (vf,founduname,f
         parmwin.close();          parmwin.close();
     }      }
   
     function pjump(type,dis,value,marker,ret,call) {      $pjump_def
         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");  
   
     }  
   
     function dateset() {      function dateset() {
         if (document.studentform.pres_marker.value=='end') {          if (document.studentform.pres_marker.value=='end') {
Line 460  ENDPICK Line 455  ENDPICK
 ###############################################################  ###############################################################
 sub print_upload_manager_footer {  sub print_upload_manager_footer {
     my ($r,$i,$keyfields,$defdom,$today,$halfyear)=@_;      my ($r,$i,$keyfields,$defdom,$today,$halfyear)=@_;
     my %param = ( formname => 'document.studentform');  
       my ($krbdef,$krbdefdom) =
           &Apache::loncommon::get_kerberos_defaults($defdom);
       my %param = ( formname => 'document.studentform',
                     kerb_def_dom => $krbdefdom,
                     kerb_def_auth => $krbdef
                     );
     my $krbform = &Apache::loncommon::authform_kerberos(%param);      my $krbform = &Apache::loncommon::authform_kerberos(%param);
     my $intform = &Apache::loncommon::authform_internal(%param);      my $intform = &Apache::loncommon::authform_internal(%param);
     my $locform = &Apache::loncommon::authform_local(%param);      my $locform = &Apache::loncommon::authform_local(%param);
Line 521  sub print_upload_manager_form { Line 522  sub print_upload_manager_form {
     my @records=&Apache::loncommon::upfile_record_sep();      my @records=&Apache::loncommon::upfile_record_sep();
     my $total=$#records;      my $total=$#records;
     my $distotal=$total+1;      my $distotal=$total+1;
     $ENV{'SERVER_NAME'}=~/(\w+\.\w+)$/;  
     my $krbdefdom=$1;  
     $krbdefdom=~tr/a-z/A-Z/;  
     my $today=time;      my $today=time;
     my $halfyear=$today+15552000;      my $halfyear=$today+15552000;
     my $defdom=$r->dir_config('lonDefDomain');      my $defdom=$r->dir_config('lonDefDomain');
       my ($krbdef,$krbdefdom) =
           &Apache::loncommon::get_kerberos_defaults($defdom);
     &print_upload_manager_header($r,$datatoken,$distotal,$krbdefdom);      &print_upload_manager_header($r,$datatoken,$distotal,$krbdefdom);
     my $i;      my $i;
     my $keyfields;      my $keyfields;
Line 599  sub enroll_single_student { Line 599  sub enroll_single_student {
             &modifystudent($ENV{'form.lcdomain'},$ENV{'form.cuname'},              &modifystudent($ENV{'form.lcdomain'},$ENV{'form.cuname'},
                            $ENV{'request.course.id'},$ENV{'form.csec'},                             $ENV{'request.course.id'},$ENV{'form.csec'},
                             $desiredhost);                              $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              my $login_result = &Apache::lonnet::modifystudent
                 ($ENV{'form.lcdomain'},$ENV{'form.cuname'},                  ($ENV{'form.lcdomain'},$ENV{'form.cuname'},
                  $ENV{'form.cstid'},$amode,$genpwd,                   $ENV{'form.cstid'},$amode,$genpwd,
                  $ENV{'form.cfirst'},$ENV{'form.cmiddle'},                   $ENV{'form.cfirst'},$ENV{'form.cmiddle'},
                  $ENV{'form.clast'},$ENV{'form.cgen'},                   $ENV{'form.clast'},$ENV{'form.cgen'},
                  $ENV{'form.csec'},$ENV{'form.enddate'},                   $ENV{'form.csec'},$enddate,
                  $ENV{'form.startdate'},$ENV{'form.forceid'},                   $startdate,$ENV{'form.forceid'},
                  $desiredhost);                   $desiredhost);
             if ($login_result =~ /^ok/) {              if ($login_result =~ /^ok/) {
                 $r->print($login_result);                  $r->print($login_result);
Line 628  sub enroll_single_student { Line 634  sub enroll_single_student {
 sub print_enroll_single_student_form {  sub print_enroll_single_student_form {
     my $r=shift;      my $r=shift;
     $r->print("<h3>Enroll One Student</h3>");      $r->print("<h3>Enroll One Student</h3>");
     my ($krbdefdom) = $ENV{'SERVER_NAME'}=~/(\w+\.\w+)$/;  
     $krbdefdom=~tr/a-z/A-Z/;  
     my $today    = time;      my $today    = time;
     my $halfyear = $today+15552000;      my $halfyear = $today+15552000;
     my $defdom=$r->dir_config('lonDefDomain');      my $defdom=$r->dir_config('lonDefDomain');
     my $javascript_validations=&javascript_validations($krbdefdom);  
     # Set up authentication forms      # Set up authentication forms
     my %param = ( formname => 'document.studentform');      my ($krbdef,$krbdefdom) =
           &Apache::loncommon::get_kerberos_defaults($defdom);
       my $javascript_validations=&javascript_validations($krbdefdom);
       my %param = ( formname => 'document.studentform',
                     kerb_def_dom => $krbdefdom,
                     kerb_def_auth => $krbdef
                     );
     my $krbform = &Apache::loncommon::authform_kerberos(%param);      my $krbform = &Apache::loncommon::authform_kerberos(%param);
     my $intform = &Apache::loncommon::authform_internal(%param);      my $intform = &Apache::loncommon::authform_internal(%param);
     my $locform = &Apache::loncommon::authform_local(%param);      my $locform = &Apache::loncommon::authform_local(%param);
     # Set up domain selection form      # Set up domain selection form
     my $domform = &domain_form($defdom);      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      # Print it all out
     $r->print(<<END);      $r->print(<<END);
 <input type="hidden" name="action" value="enrollstudent">  <input type="hidden" name="action" value="enrollstudent">
Line 713  $locform Line 740  $locform
 <input type="hidden" name="startdate"   value='$today'    />  <input type="hidden" name="startdate"   value='$today'    />
 <input type="hidden" name="enddate"     value='$halfyear' />  <input type="hidden" name="enddate"     value='$halfyear' />
 </p><p>  </p><p>
 <a   <table>
  href="javascript:pjump('date_start','Enrollment Starting Date',document.studentform.startdate.value,'start','studentform.pres','dateset');"  <tr><td align="right" ><b>Starting Date</b></td><td>$startdateform</td></tr>
 >Set Starting Date</a>  <tr><td align="right" ><b>Ending Date</b></td><td>$enddateform</td></tr>
 </p><p>  </table>
 <a   
  href="javascript:pjump('date_end','Enrollment Ending Date',document.studentform.enddate.value,'end','studentform.pres','dateset');"  
 >Set Ending Date</a>  
 </p>  </p>
 <h3>ID/Student Number</h3>  <h3>ID/Student Number</h3>
 <p>  <p>
Line 772  END Line 796  END
         $r->print(<<END);          $r->print(<<END);
 <font size="+1">  <font size="+1">
 <a href="javascript:document.studentform.state.value='csv';document.studentform.submit();">CSV format</a>  <a href="javascript:document.studentform.state.value='csv';document.studentform.submit();">CSV format</a>
   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 <a href="javascript:document.studentform.state.value='excel';document.studentform.submit();">Excel format</a>  <a href="javascript:document.studentform.state.value='excel';document.studentform.submit();">Excel format</a>
 </font>  </font>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
   Student Status:
 END  END
     }      }
     $r->print($status_select."</p>\n");      $r->print($status_select."</p>\n");
Line 1075  sub modify_single_student { Line 1101  sub modify_single_student {
     my $section    = $ENV{'form.section'};      my $section    = $ENV{'form.section'};
     my $courseid   = $ENV{'request.course.id'};      my $courseid   = $ENV{'request.course.id'};
     my $sid        = $ENV{'form.id'};      my $sid        = $ENV{'form.id'};
     my $starttime = &Apache::lonhtmlcommon::get_date_from_form('startdate',      my $starttime = &Apache::lonhtmlcommon::get_date_from_form('startdate');
                                                                time);      my $endtime   = &Apache::lonhtmlcommon::get_date_from_form('enddate');
     my $endtime   = &Apache::lonhtmlcommon::get_date_from_form('enddate',  
                                                                time);  
     my $displayable_starttime = localtime($starttime);      my $displayable_starttime = localtime($starttime);
     my $displayable_endtime   = localtime($endtime);      my $displayable_endtime   = localtime($endtime);
     #       # 
     # check for forceid override      # check for forceid override
     if (($sid ne $old{'id'}) && (! exists($ENV{'form.forceid'}))) {      if ((defined($old{'id'})) && ($old{'id'} ne '') && 
           ($sid ne $old{'id'}) && (! exists($ENV{'form.forceid'}))) {
         $r->print("<font color=\"ff0000\">You changed the students id ".          $r->print("<font color=\"ff0000\">You changed the students id ".
                   " but did not disable the ID change safeguard.".                    " but did not disable the ID change safeguard.".
                   "  The students id will not be changed.</font>");                    "  The students id will not be changed.</font>");
Line 1134  sub modify_single_student { Line 1159  sub modify_single_student {
 <p>  <p>
 END  END
     #      #
     # Send request(s) to modify data      # Send request(s) to modify data (final undef is for 'desiredhost',
       # which is a moot point because the student already has an account.
       my $modify_section_results = &modifystudent($sdom,$slogin,
                                                   $ENV{'request.course.id'},
                                                   $section,undef);
       if ($modify_section_results !~ /^ok/) {
           $r->print("An error occured during the attempt to change the ".
                     "section for this student.<br />");
       }
     my $roleresults = &Apache::lonnet::modifystudent      my $roleresults = &Apache::lonnet::modifystudent
         ($sdom,$slogin,$sid,undef,undef,$firstname,$middlename,$lastname,          ($sdom,$slogin,$sid,undef,undef,$firstname,$middlename,$lastname,
          $generation,$section,$endtime,$starttime,$ENV{'form.forceid'});           $generation,$section,$endtime,$starttime,$ENV{'form.forceid'});

Removed from v.1.60  
changed lines
  Added in v.1.67


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>