[BACK]Return to londropadd.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/Attic/londropadd.pm between versions 1.86 and 1.92

version 1.86, 2003/09/29 16:09:20 version 1.92, 2003/12/08 21:01:03
Line 48  use Apache::lonlocal; Line 48  use Apache::lonlocal;
 ###############################################################  ###############################################################
 sub header {  sub header {
     my $bodytag=&Apache::loncommon::bodytag('Enrollment Manager');      my $bodytag=&Apache::loncommon::bodytag('Enrollment Manager');
       my $title = &mt('LON-CAPA Enrollment Manager');
     return(<<ENDHEAD);      return(<<ENDHEAD);
 <html>  <html>
 <head>  <head>
 <title>LON-CAPA Enrollment Manager</title>  <title>$title</title>
 </head>  </head>
 $bodytag  $bodytag
 <form method="post" enctype="multipart/form-data"    <form method="post" enctype="multipart/form-data"  
Line 80  sub modifystudent { Line 81  sub modifystudent {
             # We are in this course              # We are in this course
             my $section=$1;              my $section=$1;
             $section='' if ($course eq $courseid.'_st');              $section='' if ($course eq $courseid.'_st');
             if ($section eq $csec) {              if (defined($csec) && $section eq $csec) {
                 $result .= 'ok:';                  $result .= 'ok:';
             } elsif ( ((!$section) && (!$csec)) || ($section ne $csec) ) {              } elsif ( ((!$section) && (!$csec)) || ($section ne $csec) ) {
                 my (undef,$end,$start)=split(/\_/,$roles{$course});                  my (undef,$end,$start)=split(/\_/,$roles{$course});
Line 140  sub domain_form { Line 141  sub domain_form {
 #  Menu Phase One  #  Menu Phase One
 sub print_main_menu {  sub print_main_menu {
     my $r=shift;      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');
   
     $r->print(<<END);      $r->print(<<END);
 <p>  <p>
 <font size="+1">  <font size="+1">
     <a href="/adm/dropadd?action=upload">Upload a course list</a>      <a href="/adm/dropadd?action=upload">$Text{'upload'}</a>
 </font>  </font>
 </p><p>  </p><p>
 <font size="+1">  <font size="+1">
     <a href="/adm/dropadd?action=enrollstudent">Enroll a single student</a>      <a href="/adm/dropadd?action=enrollstudent">$Text{'enrollone'}</a>
 </font>  </font>
 </p><p>  </p><p>
 <font size="+1">  <font size="+1">
     <a href="/adm/dropadd?action=modifystudent">Modify student data</a>      <a href="/adm/dropadd?action=modifystudent">$Text{'modify'}</a>
 </font>  </font>
 </p><p>  </p><p>
 <font size="+1">  <font size="+1">
     <a href="/adm/dropadd?action=classlist">View Class List</a>      <a href="/adm/dropadd?action=classlist">$Text{'view'}</a>
 </font>  </font>
 </p><p>  </p><p>
 <font size="+1">  <font size="+1">
     <a href="/adm/dropadd?action=drop">Drop Students</a>      <a href="/adm/dropadd?action=drop">$Text{'drop'}</a>
   </font>
   </p><p>
   <font size="+1">
       <a href="/adm/populate">$Text{'populate'}</a>
 </font>  </font>
 </p>  
 END  END
 }  }
   
 ###############################################################  ###############################################################
 ###############################################################  ###############################################################
   sub hidden_input {
       my ($name,$value) = @_;
       return '<input type="hidden" name="'.$name.'" value="'.$value.'" />'."\n";
   }
   
 sub print_upload_manager_header {  sub print_upload_manager_header {
     my ($r,$datatoken,$distotal,$krbdefdom)=@_;      my ($r,$datatoken,$distotal,$krbdefdom)=@_;
     my $javascript;      my $javascript;
Line 185  sub print_upload_manager_header { Line 202  sub print_upload_manager_header {
     } else {      } else {
  $javascript=&upload_manager_javascript_forward_associate();   $javascript=&upload_manager_javascript_forward_associate();
     }      }
     my $javascript_validations=&javascript_validations($krbdefdom);      my $javascript_validations=&javascript_validations('auth',$krbdefdom);
     my $checked=(($ENV{'form.noFirstLine'})?' checked="1"':'');      my $checked=(($ENV{'form.noFirstLine'})?' checked="1"':'');
     $r->print(<<ENDPICK);      $r->print('<h3>'.&mt('Uploading Class List')."</h3>\n".
 <h3>Uploading Class List</h3>                "<hr>\n".
 <hr>                '<h3>'.&mt('Identify fields')."</h3>\n");
 <h3>Identify fields</h3>      $r->print("<p>\n".
 Total number of records found in file: $distotal <hr />                &mt('Total number of records found in file: [_1].',$distotal).
 Enter as many fields as you can. The system will inform you and bring you back                "\n".
 to this page if the data selected is insufficient to run your class.<hr />                "</p><hr>\n");
 <input type="button" value="Reverse Association" onClick="javascript:this.form.associate.value='Reverse Association';submit(this.form);" />      $r->print(&mt('Enter as many fields as you can. '.
 <input type="hidden" name="action"     value="upload" />                    'The system will inform you and bring you back to '.
 <input type="hidden" name="state"      value="got_file" />                    'this page if the data selected is insufficient to '.
 <input type="hidden" name="associate"  value="" />                    'enroll students in your class.')."<hr>\n");
 <input type="hidden" name="datatoken"  value="$datatoken" />      $r->print(&hidden_input('action','upload').
 <input type="hidden" name="fileupload" value="$ENV{'form.fileupload'}" />                &hidden_input('state','got_file').
 <input type="checkbox" name="noFirstLine" $checked />Ignore First Line                &hidden_input('associate','').
 <input type="hidden" name="upfiletype" value="$ENV{'form.upfiletype'}" />                &hidden_input('datatoken',$datatoken).
 <input type="hidden" name="upfile_associate"                 &hidden_input('fileupload',$ENV{'form.fileupload'}).
                                        value="$ENV{'form.upfile_associate'}" />                &hidden_input('upfiletype',$ENV{'form.upfiletype'}).
 <hr />                &hidden_input('upfile_associate',$ENV{'form.upfile_associate'}));
 <script type="text/javascript" language="Javascript">      $r->print('<input type="button" value="Reverse Association" '.
 $javascript                'name="'.&mt('Reverse Association').'" '.
 $javascript_validations                'onClick="javascript:this.form.associate.value=\'Reverse Association\';submit(this.form);" />');
 </script>      $r->print('<input type="checkbox" name="noFirstLine" $checked />'.
 ENDPICK                &mt('Ignore First Line'));
       $r->print("<hr />\n".
                 '<script type="text/javascript" language="Javascript">'."\n".
                 $javascript."\n".$javascript_validations.'</script>');
 }  }
   
 ###############################################################  ###############################################################
 ###############################################################  ###############################################################
 sub javascript_validations {  sub javascript_validations {
     my ($krbdefdom)=@_;      my ($mode,$krbdefdom)=@_;
     my %param = ( formname => 'studentform',      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 );                    kerb_def_dom => $krbdefdom );
     my $authheader = &Apache::loncommon::authform_header(%param);          $authheader = &Apache::loncommon::authform_header(%param);
     my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition();      }
     return (<<ENDPICK);      
       my %alert = &Apache::lonlocal::texthash
           (username => 'You need to specify the username field.',
            authen   => 'You must choose an authentication type.',
            krb      => 'You need to specify the Kerberos domain.',
            ipass    => 'You need to specify the initial password.',
            name     => 'The optional name field was not specified.',
            snum     => 'The optional student number field was not specified.',
            section  => 'The optional section or group field was not specified.', 
            email    => 'The optional email address field was not specified.',
            continue => 'Continue enrollment?',
            );
       
   #    my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition();
       my $function_name =(<<END);
 function verify_message (vf,founduname,foundpwd,foundname,foundid,foundsec,foundemail) {  function verify_message (vf,founduname,foundpwd,foundname,foundid,foundsec,foundemail) {
   END
       my $auth_checks = (<<END);
     var foundatype=0;      var foundatype=0;
     var message='';  END
       unless ($mode eq 'createcourse') {
           $auth_checks .= (<<END);
     if (founduname==0) {      if (founduname==0) {
  alert('You need to specify the username field');   alert('$alert{'username'}');
         return;          return;
     }      }
   END
       }
       $auth_checks .= (<<END);
     // alert('current.radiovalue = '+current.radiovalue);      // 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('$alert{'authen'}');
         return;          return;
     }      }
     foundatype=1;      foundatype=1;
Line 239  function verify_message (vf,founduname,f Line 286  function verify_message (vf,founduname,f
         var alertmsg = '';          var alertmsg = '';
         switch (current.value) {          switch (current.value) {
             case 'krb':               case 'krb': 
                 alertmsg = 'You need to specify the Kerberos domain';                  alertmsg = '$alert{'krb'}';
                 break;                  break;
             case 'loc':              case 'loc':
             case 'fsys':              case 'fsys':
                 alertmsg = 'You need to specify the initial password';                  alertmsg = '$alert{'ipass'}';
                 break;                  break;
             case 'fsys':              case 'fsys':
                 alertmsg = '';                  alertmsg = '';
Line 256  function verify_message (vf,founduname,f Line 303  function verify_message (vf,founduname,f
             return;              return;
         }          }
     }      }
   END
     if (foundname==0) { message='name fields'; }      my $optional_checks = '';
     if (foundid==0) { if (message!='') { message+=', '; } message+='student number field'; }      if ($mode eq 'createcourse') {
     if (foundsec==0) {  if (message!='') { message+=', '; } message+='section or group field'; }          $optional_checks = (<<END);
     if (foundemail==0) {  if (message!='') { message+=', '; } message+='email address field'; }      vf.submit();
     if (message!='') {  
        message='Not specified (optional): '+message+'.  Continue enrollment?';  
        if (confirm(message)) {  
           vf.state.value='enrolling';  
   vf.submit();  
        }  
     } else {  
       vf.state.value='enrolling';  
       vf.submit();  
     }  
 }  
   
 $authheader  
 ENDPICK  
   
 }  }
   END
 sub javascript_validations_without_auth {      } else {
     my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition();          $optional_checks = (<<END);
     return (<<ENDPICK);  
 function verify_message (vf,founduname,foundpwd,foundname,foundid,foundsec,foundemail) {  
     var foundatype=0;  
     var message='';      var message='';
     if (founduname==0) {      if (foundname==0) { 
  alert('You need to specify the username field');          message='$alert{'name'}';
         return;      }
       if (foundid==0) { 
           if (message!='') { 
               message+='\\n'; 
           }
           message+='$alert{'snum'}';
       }
       if (foundsec==0) {
           if (message!='') {
               message+='\\n';
           } 
           message+='$alert{'section'}';
       }
       if (foundemail==0) {
           if (message!='') {
               message+='\\n';
           }
           message+='$alert{'email'}';
     }      }
     if (foundname==0) { message='name fields'; }  
     if (foundid==0) { if (message!='') { message+=', '; } message+='student number field'; }  
     if (foundsec==0) {  if (message!='') { message+=', '; } message+='section or group field'; }  
     if (foundemail==0) {  if (message!='') { message+=', '; } message+='email address field'; }  
     if (message!='') {      if (message!='') {
        message='Not specified (optional): '+message+'.  Continue enrollment?';          message+= '\\n$alert{'continue'}';
        if (confirm(message)) {          if (confirm(message)) {
           vf.state.value='enrolling';              vf.state.value='enrolling';
   vf.submit();              vf.submit();
        }          }
     } else {      } else {
       vf.state.value='enrolling';          vf.state.value='enrolling';
       vf.submit();          vf.submit();
     }      }
 }  }
   END
 ENDPICK      }
       my $result = $function_name;
       if ( ($mode eq 'auth') || ($mode eq 'createcourse') ) {
           $result .= $auth_checks;
       }
       $result .= $optional_checks;
       if ( ($mode eq 'auth') || ($mode eq 'createcourse') ) {
           $result .= $authheader;
       }
       return $result;
 }  }
   
 ###############################################################  ###############################################################
Line 472  sub print_upload_manager_footer { Line 522  sub print_upload_manager_footer {
     my $locform = &Apache::loncommon::authform_local(%param);      my $locform = &Apache::loncommon::authform_local(%param);
     my $domform = &domain_form($defdom);      my $domform = &domain_form($defdom);
     my $date_table = &date_setting_table();      my $date_table = &date_setting_table();
     $r->print(<<ENDPICK);      my $Str = "</table>\n";
 </table>      $Str .= &hidden_input('nfields',$i);
 <input type=hidden name=nfields value=$i>      $Str .= &hidden_input('keyfields',$keyfields);
 <input type=hidden name=keyfields value="$keyfields">      $Str .= '<h3>'.&mt('Login Type')."</h3>\n";
 <h3>Login Type</h3>      $Str .= "<p>\n".
 <p>Note: this will not take effect if the user already exists</p>          &mt('Note: this will not take effect if the user already exists').
 <p>          "</p><p>\n";
 $krbform      $Str .= $krbform."\n</p><p>\n".
 </p>          $intform."\n</p><p>\n".
 <p>          $locform."\n</p>\n";
 $intform      $Str .= '<h3>'.&mt('LON-CAPA Domain for Students')."</h3>\n";
 </p>      $Str .= "<p>\n".&mt('LON-CAPA domain: [_1]',$domform)."\n</p>\n";
 <p>      $Str .= "<h3>".&mt('Starting and Ending Dates')."</h3>\n";
 $locform      $Str .= "<p>\n".$date_table."</p>\n";
 </p>      $Str .= "<h3>".&mt('Full Update')."</h3>\n";
 <h3>LON-CAPA Domain for Students</h3>      $Str .= '<input type="checkbox" name="fullup" value="yes">'.
 LON-CAPA domain: $domform <p>          ' '.&mt('Full update (also print list of users not enrolled anymore)').
 <h3>Starting and Ending Dates</h3>          "</p>\n";
 <p>      $Str .= "<h3>".&mt('Student Number')."</h3>\n";
 $date_table      $Str .= "<p>\n".'<input type="checkbox" name="forceid" value="yes">';
 </p>      $Str .= &mt('Disable ID/Student Number Safeguard and Force Change '.
 <h3>Full Update</h3>                  'of Conflicting IDs (only do if you know what you are doing)').
 <input type=checkbox name=fullup value=yes> Full update                   "\n</p><p>\n";
 (also print list of users not enrolled anymore)<p>      $Str .= '<input type="button" onClick="javascript:verify(this.form)" '.
 <h3>ID/Student Number</h3>          'value="Update Courselist" />'."<br />\n";
 <input type=checkbox name=forceid value=yes>       $Str .= &mt('Note: for large courses, this operation may be time '.
 Disable ID/Student Number Safeguard and Force Change of Conflicting IDs                  'consuming');
 (only do if you know what you are doing)<p>      $r->print($Str);
 <input type="button" onClick="javascript:verify(this.form)" value="Update Courselist" /><br />      return;
 Note: for large courses, this operation may be time consuming.  
 ENDPICK  
 }  }
   
 # ======================================================= Menu Phase Two Upload  ###############################################################
   ###############################################################
 sub print_upload_manager_form {  sub print_upload_manager_form {
     my $r=shift;      my $r=shift;
     my $firstLine;      my $firstLine;
     my $datatoken;      my $datatoken;
     if (!$ENV{'form.datatoken'}) {      if (!$ENV{'form.datatoken'}) {
       $datatoken=&Apache::loncommon::upfile_store($r);          $datatoken=&Apache::loncommon::upfile_store($r);
     } else {      } else {
       $datatoken=$ENV{'form.datatoken'};          $datatoken=$ENV{'form.datatoken'};
       &Apache::loncommon::load_tmp_file($r);          &Apache::loncommon::load_tmp_file($r);
     }      }
     my @records=&Apache::loncommon::upfile_record_sep();      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 $total=$#records;
     my $distotal=$total+1;      my $distotal=$total+1;
     my $today=time;      my $today=time;
Line 529  sub print_upload_manager_form { Line 580  sub print_upload_manager_form {
     my $i;      my $i;
     my $keyfields;      my $keyfields;
     if ($total>=0) {      if ($total>=0) {
  my @d=(['username','Username'],          my @field=(['username',&mt('Username')],
                ['names','Last Name, First Names'],                     ['names',&mt('Last Name, First Names')],
        ['fname','First Name'],                     ['fname',&mt('First Name')],
                ['mname','Middle Names/Initials'],                     ['mname',&mt('Middle Names/Initials')],
        ['lname','Last Name'],                     ['lname',&mt('Last Name')],
                ['gen','Generation'],                     ['gen',&mt('Generation')],
        ['id','ID/Student Number'],                     ['id',&mt('ID/Student Number')],
                ['sec','Group/Section'],                     ['sec',&mt('Group/Section')],
        ['ipwd','Initial Password'],                     ['ipwd',&mt('Initial Password')],
                ['email','EMail Address']);                     ['email',&mt('EMail Address')]);
  if ($ENV{'form.upfile_associate'} eq 'reverse') {   if ($ENV{'form.upfile_associate'} eq 'reverse') {
     &Apache::loncommon::csv_print_samples($r,\@records);      &Apache::loncommon::csv_print_samples($r,\@records);
     $i=&Apache::loncommon::csv_print_select_table($r,\@records,\@d);      $i=&Apache::loncommon::csv_print_select_table($r,\@records,
     foreach (@d) { $keyfields.=$_->[0].','; }                                                            \@field);
       foreach (@field) { 
                   $keyfields.=$_->[0].','; 
               }
     chop($keyfields);      chop($keyfields);
  } else {   } else {
     unshift(@d,['none','']);      unshift(@field,['none','']);
     $i=&Apache::loncommon::csv_samples_select_table($r,\@records,\@d);      $i=&Apache::loncommon::csv_samples_select_table($r,\@records,
                                                               \@field);
     my %sone=&Apache::loncommon::record_sep($records[0]);      my %sone=&Apache::loncommon::record_sep($records[0]);
     $keyfields=join(',',sort(keys(%sone)));      $keyfields=join(',',sort(keys(%sone)));
  }   }
Line 554  sub print_upload_manager_form { Line 609  sub print_upload_manager_form {
     &print_upload_manager_footer($r,$i,$keyfields,$defdom,$today,$halfyear);      &print_upload_manager_footer($r,$i,$keyfields,$defdom,$today,$halfyear);
 }  }
   
 # ======================================================= Enroll single student  ###############################################################
   ###############################################################
 sub enroll_single_student {  sub enroll_single_student {
     my $r=shift;      my $r=shift;
     # Remove non alphanumeric values from section      # Remove non alphanumeric values from section
Line 640  sub enroll_single_student { Line 696  sub enroll_single_student {
 }  }
   
 sub setup_date_selectors {  sub setup_date_selectors {
     my ($starttime,$endtime) = @_;      my ($starttime,$endtime,$mode) = @_;
     if (! defined($starttime)) {      if (! defined($starttime)) {
         $starttime = time;          $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'})) {                              '.default_enrollment_start_date'})) {
             $starttime = $ENV{'course.'.$ENV{'request.course.id'}.                  $starttime = $ENV{'course.'.$ENV{'request.course.id'}.
                                   '.default_enrollment_start_date'};                                    '.default_enrollment_start_date'};
               }
         }          }
     }      }
     if (! defined($endtime)) {      if (! defined($endtime)) {
         $endtime = time+(6*30*24*60*60); # 6 months from now, approx          $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'})) {                              '.default_enrollment_end_date'})) {
             $endtime = $ENV{'course.'.$ENV{'request.course.id'}.                  $endtime = $ENV{'course.'.$ENV{'request.course.id'}.
                                 '.default_enrollment_end_date'};                                  '.default_enrollment_end_date'};
               }
         }          }
     }      }
     my $startdateform = &Apache::lonhtmlcommon::date_setter('studentform',      my $startdateform = &Apache::lonhtmlcommon::date_setter('studentform',
Line 663  sub setup_date_selectors { Line 723  sub setup_date_selectors {
     my $enddateform = &Apache::lonhtmlcommon::date_setter('studentform',      my $enddateform = &Apache::lonhtmlcommon::date_setter('studentform',
                                                           'enddate',                                                            'enddate',
                                                           $endtime);                                                            $endtime);
       if ($mode eq 'createcourse') {
           $startdateform = &Apache::lonhtmlcommon::date_setter('ccrs',
                                                               'startdate',
                                                               $starttime);
           $enddateform = &Apache::lonhtmlcommon::date_setter('ccrs',
                                                             'enddate',
                                                             $endtime);
       }
     return ($startdateform,$enddateform);      return ($startdateform,$enddateform);
 }  }
   
Line 676  sub get_dates_from_form { Line 744  sub get_dates_from_form {
 }  }
   
 sub date_setting_table {  sub date_setting_table {
     my ($starttime,$endtime) = @_;      my ($starttime,$endtime,$mode) = @_;
     my ($startform,$endform)=&setup_date_selectors($starttime,$endtime);      my ($startform,$endform)=&setup_date_selectors($starttime,$endtime,$mode);
     my $dateDefault = '<nobr>'.      my $dateDefault = '<nobr>'.
         '<input type="checkbox" name="makedatesdefault" />'.          '<input type="checkbox" name="makedatesdefault" />'.
         ' make these dates the default for future enrollment';          ' make these dates the default for future enrollment';
       if ($mode eq 'createcourse') {
           $dateDefault = '&nbsp;';
       }
     my $perpetual = '<nobr><input type="checkbox" name="no_end_date"';      my $perpetual = '<nobr><input type="checkbox" name="no_end_date"';
     if (defined($endtime) && $endtime == 0) {      if (defined($endtime) && $endtime == 0) {
         $perpetual .= ' checked';          $perpetual .= ' checked';
Line 755  sub print_enroll_single_student_form { Line 826  sub print_enroll_single_student_form {
     if ($home ne 'no_host') {      if ($home ne 'no_host') {
         $new_user = 0;          $new_user = 0;
     }      }
     &Apache::lonnet::logthis('home = '.$home);  
     #      #
     my $user_data_html = '';      my $user_data_html = '';
     my $javascript_validations = '';      my $javascript_validations = '';
Line 764  sub print_enroll_single_student_form { Line 834  sub print_enroll_single_student_form {
         # Set up authentication forms          # Set up authentication forms
         my ($krbdef,$krbdefdom) =          my ($krbdef,$krbdefdom) =
             &Apache::loncommon::get_kerberos_defaults($domain);              &Apache::loncommon::get_kerberos_defaults($domain);
         $javascript_validations=&javascript_validations($krbdefdom);          $javascript_validations=&javascript_validations('auth',$krbdefdom);
         my %param = ( formname => 'document.studentform',          my %param = ( formname => 'document.studentform',
                       kerb_def_dom => $krbdefdom,                        kerb_def_dom => $krbdefdom,
                       kerb_def_auth => $krbdef                        kerb_def_auth => $krbdef
Line 813  END Line 883  END
     } else {      } else {
         # User already exists.  Do not worry about authentication          # User already exists.  Do not worry about authentication
         my %uenv = &Apache::lonnet::dump('environment',$domain,$username);          my %uenv = &Apache::lonnet::dump('environment',$domain,$username);
         $javascript_validations = &javascript_validations_without_auth();          $javascript_validations = &javascript_validations('noauth');
         $user_data_html = <<END;          $user_data_html = <<END;
 <h3>User Data for $username\@$domain</h3>  <h3>User Data for $username\@$domain</h3>
 <input type="hidden" name="lcserver" value="default" />  <input type="hidden" name="lcserver" value="default" />
Line 906  END Line 976  END
 # ========================================================= Menu Phase Two Drop  # ========================================================= Menu Phase Two Drop
 sub print_drop_menu {  sub print_drop_menu {
     my $r=shift;      my $r=shift;
     $r->print("<h3>Drop Students</h3>");      $r->print("<h3>".&mt('Drop Students')."</h3>");
     my $cid=$ENV{'request.course.id'};      my $cid=$ENV{'request.course.id'};
     my ($classlist,$keylist) = &Apache::loncoursedata::get_classlist();      my ($classlist,$keylist) = &Apache::loncoursedata::get_classlist();
     if (! defined($classlist)) {      if (! defined($classlist)) {
Line 1025  END Line 1095  END
             $r->print('"'.join('","',("username","domain","ID","student name",              $r->print('"'.join('","',("username","domain","ID","student name",
                                       "section","status")).'"'."\n");                                        "section","status")).'"'."\n");
         } else {          } else {
             $r->print('"'.join('","',("username","domain","ID","student name",              $r->print('"'.join('","',(&mt("username"),"domain","ID","student name",
                                       "section")).'"'."\n");                                        "section")).'"'."\n");
         }          }
     } elsif ($mode eq 'excel') {      } elsif ($mode eq 'excel') {
Line 1150  sub print_modify_student_form { Line 1220  sub print_modify_student_form {
     }      }
     # determine the students starting and ending times and section      # determine the students starting and ending times and section
     my ($starttime,$endtime,$section) = &get_enrollment_data($sname,$sdom);      my ($starttime,$endtime,$section) = &get_enrollment_data($sname,$sdom);
       if ($starttime =~ /^error/) {
           $r->print('<h2>Error</h2>');
           $r->print('<p>'.$starttime.'</p>');
           return;
       }
     # Deal with date forms      # Deal with date forms
     my $date_table = &date_setting_table($starttime,$endtime);      my $date_table = &date_setting_table($starttime,$endtime);
     #      #
Line 1349  sub get_enrollment_data { Line 1424  sub get_enrollment_data {
     my %roles = &Apache::lonnet::dump('roles',$sdomain,$sname);      my %roles = &Apache::lonnet::dump('roles',$sdomain,$sname);
     my ($tmp) = keys(%roles);      my ($tmp) = keys(%roles);
     # Bail out if we were unable to get the students roles      # Bail out if we were unable to get the students roles
     return "666" if ($tmp =~ /^(con_lost|error|no_such_host)/i);      return ('error'.$tmp) if ($tmp =~ /^(con_lost|error|no_such_host)/i);
     # Go through the roles looking for enrollment in this course      # Go through the roles looking for enrollment in this course
     my ($end,$start) = (undef,undef);      my ($end,$start) = (undef,undef);
     my $section = '';      my $section = '';
Line 1439  END Line 1514  END
 <tr>  <tr>
     <th>&nbsp;</th>      <th>&nbsp;</th>
     <th>username</th>      <th>username</th>
     <th>domain</th>      <th>domaind</th>
     <th>ID</th>      <th>ID</th>
     <th>student name</th>      <th>student name</th>
     <th>section</th>      <th>section</th>
Line 1447  END Line 1522  END
 END  END
   
     } else  {      } else  {
           my $wordusername=&mt('username');
           my $worddomain=&mt('domain');
           my $wordstudentname=&mt('student name');
           my $wordsection=&mt('section');
         $r->print(<<END);          $r->print(<<END);
 <table border=2>  <table border=2>
 <tr><th>&nbsp;</th>  <tr><th>&nbsp;</th>
     <th>      <th>
        <a href="/adm/dropadd?action=$action&sortby=username">username</a>         <a href="/adm/dropadd?action=$action&sortby=username">$wordusername</a>
     </th><th>      </th><th>
        <a href="/adm/dropadd?action=$action&sortby=domain">domain</a>         <a href="/adm/dropadd?action=$action&sortby=domain">$worddomain</a>
     </th><th>      </th><th>
        <a href="/adm/dropadd?action=$action&sortby=id">ID</a>         <a href="/adm/dropadd?action=$action&sortby=id">ID</a>
     </th><th>      </th><th>
        <a href="/adm/dropadd?action=$action&sortby=fullname">student name</a>         <a href="/adm/dropadd?action=$action&sortby=fullname">$wordstudentname</a>
     </th><th>      </th><th>
        <a href="/adm/dropadd?action=$action&sortby=section">section</a>         <a href="/adm/dropadd?action=$action&sortby=section">$wordsection</a>
     </th>      </th>
 </tr>  </tr>
 END  END
Line 1503  END Line 1582  END
 END  END
     }      }
     $r->print('</table><br>');      $r->print('</table><br>');
       my $DropStudents=&mt('Drop Students');
       my $CheckAll=&mt('check all');
       my $UncheckAll=&mt('uncheck all');
     $r->print(<<"END");      $r->print(<<"END");
 </p><p>  </p><p>
 <input type="button" value="check all" onclick="javascript:checkAll(document.studentform.droplist)"> &nbsp;  <input type="button" value="$CheckAll" onclick="javascript:checkAll(document.studentform.droplist)"> &nbsp;
 <input type="button" value="uncheck all" onclick="javascript:uncheckAll(document.studentform.droplist)">   <input type="button" value="$UncheckAll" onclick="javascript:uncheckAll(document.studentform.droplist)"> 
 <p><input type=submit value="Drop Students"></p>  <p><input type=submit value="$DropStudents"></p>
 END  END
     return;      return;
 }  }
Line 1517  END Line 1599  END
 #  #
 sub print_first_courselist_upload_form {  sub print_first_courselist_upload_form {
     my $r=shift;      my $r=shift;
     my $upfile_select=&Apache::loncommon::upfile_select_html();      my $str;
     my $create_classlist_help =       $str  = '<input type="hidden" name="phase" value="two">';
  &Apache::loncommon::help_open_topic("Course_Create_Class_List",      $str .= '<input type="hidden" name="action" value="upload" />';
            "How do I create a class list from a spreadsheet");      $str .= '<input type="hidden"   name="state"  value="got_file" />';
     my $create_csv_help =      $str .= "<h3>".&mt('Upload a class list')."</h3>\n";
  &Apache::loncommon::help_open_topic("Course_Convert_To_CSV",      $str .= &Apache::loncommon::upfile_select_html();
            "How do I create a CSV file from a spreadsheet");      $str .= "<p>\n";
     $r->print(<<ENDUPFORM);      $str .= '<input type="submit" name="fileupload" value="'.
 <input type=hidden name=phase value=two>          &mt('Upload class list').'">'."\n";
 <h3>Upload a courselist</h3>      $str .= '<input type="checkbox" name="noFirstLine" /> '.
 $upfile_select          &mt('Ignore First Line')."</p>\n";
 <p>      $str .= &Apache::loncommon::help_open_topic("Course_Create_Class_List",
 <input type=submit name="fileupload" value="Upload Courselist">                           &mt("How do I create a class list from a spreadsheet")).
 <input type="hidden" name="action" value="upload" />                               "<br />\n";
 <input type="hidden" name="state"  value="got_file" />      $str .= &Apache::loncommon::help_open_topic("Course_Convert_To_CSV",
 <input type="checkbox" name="noFirstLine" /> Ignore First Line<br />                             &mt("How do I create a CSV file from a spreadsheet")).
 </p>                                 "<br />\n";
 $create_classlist_help <br />      $str .= "</body>\n</html>\n";
 $create_csv_help      $r->print($str);
 </body></html>  
 ENDUPFORM  
     return;      return;
 }  }
   
Line 1572  sub upfile_drop_add { Line 1652  sub upfile_drop_add {
     } else {      } else {
         my %home_servers = &Apache::loncommon::get_library_servers($domain);          my %home_servers = &Apache::loncommon::get_library_servers($domain);
         if (! exists($home_servers{$desiredhost})) {          if (! exists($home_servers{$desiredhost})) {
             $r->print('<font color="#ff0000">Error:</font>'.              $r->print('<font color="#ff0000">'.&mt('Error').'</font>'.
                       'Invalid home server specified');                        &mt('Invalid home server specified'));
               $r->print("</body>\n</html>\n");
             return;              return;
         }          }
     }      }
Line 1598  sub upfile_drop_add { Line 1679  sub upfile_drop_add {
     if ($amode =~ /^krb/) {      if ($amode =~ /^krb/) {
         if (! defined($genpwd) || $genpwd eq '') {          if (! defined($genpwd) || $genpwd eq '') {
             $r->print('<font color="red" size="+1">'.              $r->print('<font color="red" size="+1">'.
                       'Unable to enroll students:'.'</font>  '.                        &mt('Unable to enroll students').'</font>  '.
                       'No Kerberos domain was specified.</p>');                        &mt('No Kerberos domain was specified.').'</p>');
             $amode = ''; # This causes the loop below to be skipped              $amode = ''; # This causes the loop below to be skipped
         }          }
     }      }
Line 1607  sub upfile_drop_add { Line 1688  sub upfile_drop_add {
         #######################################          #######################################
         ##         Enroll Students           ##          ##         Enroll Students           ##
         #######################################          #######################################
         $r->print('<h3>Enrolling Students</h3>'."\n".'<p>');          $r->print('<h3>'.&mt('Enrolling Students')."</h3>\n<p>\n");
         my $count=0;          my $count=0;
         my $flushc=0;          my $flushc=0;
         my %student=();          my %student=();
Line 1636  sub upfile_drop_add { Line 1717  sub upfile_drop_add {
                     }                      }
                 }                  }
                 if ($entries{$fields{'username'}}=~/\W/) {                  if ($entries{$fields{'username'}}=~/\W/) {
                     $r->print('<br /><b>Unacceptable username: '.                      $r->print('<br />'.
                               $entries{$fields{'username'}}.' for user '.        &mt('<b>[_1]</b>: Unacceptable username for user [_2] [_3] [_4] [_5]',
                               $fname.' '.$mname.' '.$lname.' '.$gen.'</b>');            $entries{$fields{'username'}},$fname,$mname,$lname,$gen).
                                 '</b>');
                 } else {                  } else {
                     # determine section number                      # determine section number
                     my $sec='';                      my $sec='';
Line 1692  sub upfile_drop_add { Line 1774  sub upfile_drop_add {
                              $email);                               $email);
                         if ($reply ne 'ok') {                          if ($reply ne 'ok') {
                             $reply =~ s/^error://;                              $reply =~ s/^error://;
                             $r->print('<br /><b>'.$username.'</b>:'.                              $r->print('<br />'.
                                       '  Unable to enroll: '.$reply);                  &mt('<b>[_1]</b>:  Unable to enroll: [_2]',$username,$reply));
           } else {            } else {
                             $count++; $flushc++;                              $count++; $flushc++;
                             $student{$username}=1;                              $student{$username}=1;
Line 1704  sub upfile_drop_add { Line 1786  sub upfile_drop_add {
                             }                              }
                         }                          }
                     } else {                      } else {
                         $r->print('<br /><b>'.$username.'</b>:'.                          $r->print('<br />'.
                            '  Unable to enroll: No password specified.');        &mt('<b>[_1]</b>: Unable to enroll.  No password specified.',$username)
                                     );
                     }                      }
                 }                  }
             }              }
         } # end of foreach (@studentdata)          } # end of foreach (@studentdata)
         $r->print('</p><p>Processed Students: '.$count.'</p>');          $r->print("</p>\n<p>\n".&mt('Processed [_1] student(s).',$count).
         $r->print("<p>If active, the new role will be available when the ".                    "</p>\n");
                   "students next log in to LON-CAPA.</p>");          $r->print("<p>\n".
                     &mt('If active, the new role will be available when the '.
                     'students next log in to LON-CAPA.')."</p>\n");
         #####################################          #####################################
         #           Drop students           #          #           Drop students           #
         #####################################          #####################################
         if ($ENV{'form.fullup'} eq 'yes') {          if ($ENV{'form.fullup'} eq 'yes') {
             $r->print('<h3>Dropping Students</h3>');              $r->print('<h3>'.&mt('Dropping Students')."</h3>\n");
             #  Get current classlist              #  Get current classlist
             my ($classlist,$keylist)=&Apache::loncoursedata::get_classlist();              my ($classlist,$keylist)=&Apache::loncoursedata::get_classlist();
             if (! defined($classlist)) {              if (! defined($classlist)) {
                 $r->print("There are no students currently enrolled.\n");                  $r->print(&mt('There are no students currently enrolled.').
                             "\n");
             } else {              } else {
                 # Remove the students we just added from the list of students.                  # Remove the students we just added from the list of students.
                 foreach (@studentdata) {                  foreach (@studentdata) {
Line 1754  sub drop_student_list { Line 1840  sub drop_student_list {
         # drop student          # drop student
         my $result = &modifystudent($udom,$uname,$ENV{'request.course.id'});          my $result = &modifystudent($udom,$uname,$ENV{'request.course.id'});
         if ($result eq 'ok' || $result eq 'ok:') {          if ($result eq 'ok' || $result eq 'ok:') {
             $r->print('Dropped '.$uname.' @ '.$udom.'<br>');              $r->print(&mt('Dropped [_1]',$uname.'@'.$udom).'<br>');
             $count++;              $count++;
         } else {          } else {
             $r->print('Error dropping '.$uname.' @ '.$udom.': '.$result.              $r->print(
             &mt('Error dropping [_1]:[_2]',$uname.'@'.$udom,$result).
                       '<br />');                        '<br />');
         }          }
     }      }
     $r->print('<p><b>Dropped '.$count.' student(s).</b>');      $r->print('<p><b>'.&mt('Dropped [_1] student(s).',$count).'</b></p>');
     $r->print('<p>Re-enrollment will re-activate data.') if ($count);      $r->print('<p>'.&mt('Re-enrollment will re-activate data.')) if ($count);
 }  }
   
 ###################################################################  ###################################################################
Removed from v.1.86  
changed lines
  Added in v.1.92

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