[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.59 and 1.68

version 1.59, 2002/10/16 18:45:10 version 1.68, 2003/06/20 20:57:44
Line 41  use Apache::lonnet(); Line 41  use Apache::lonnet();
 use Apache::loncommon();  use Apache::loncommon();
 use Apache::lonhtmlcommon();  use Apache::lonhtmlcommon();
 use Apache::Constants qw(:common :http REDIRECT);  use Apache::Constants qw(:common :http REDIRECT);
   use Spreadsheet::WriteExcel;
   
 ###############################################################  ###############################################################
 ###############################################################  ###############################################################
Line 92  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 212  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 220  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 251  function verify_message (vf,founduname,f Line 254  function verify_message (vf,founduname,f
     if (foundname==0) { message='No name fields specified. '; }      if (foundname==0) { message='No name fields specified. '; }
     if (foundid==0) { message+='No ID or student number field specified. '; }      if (foundid==0) { message+='No ID or student number field specified. '; }
     if (foundsec==0) { message+='No section or group field specified. '; }      if (foundsec==0) { message+='No section or group field specified. '; }
     if (vf.startdate.value=='') {  
  message+='No starting date set. ';  
     }  
     if (vf.enddate.value=='') {  
         message+='No ending date set. ';  
     }  
     if ((vf.enddate.value!='') && (vf.startdate.value!='')) {  
        if (Math.round(vf.enddate.value)<Math.round(vf.startdate.value)) {  
           alert('Ending date is before starting date');  
           return;  
        }  
     }  
     if (message!='') {      if (message!='') {
        message+='Continue enrollment?';         message+='Continue enrollment?';
        if (confirm(message)) {         if (confirm(message)) {
   pclose();  
           vf.state.value='enrolling';            vf.state.value='enrolling';
   vf.submit();    vf.submit();
        }         }
     } else {      } else {
       pclose();  
       vf.state.value='enrolling';        vf.state.value='enrolling';
       vf.submit();        vf.submit();
     }      }
 }  }
   
   
     function pclose() {  
         parmwin=window.open("/adm/rat/empty.html","LONCAPAparms",  
                  "height=350,width=350,scrollbars=no,menubar=no");  
         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");  
   
     }  
   
     function dateset() {  
         if (document.studentform.pres_marker.value=='end') {  
            document.studentform.enddate.value=  
        document.studentform.pres_value.value;  
         }  
         if (document.studentform.pres_marker.value=='start') {  
            document.studentform.startdate.value=  
        document.studentform.pres_value.value;  
         }  
         pclose();  
     }  
   
 $authheader  $authheader
 ENDPICK  ENDPICK
   
Line 459  ENDPICK Line 420  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);
     my $domform = &domain_form($defdom);      my $domform = &domain_form($defdom);
       my $date_table = &date_setting_table();
     $r->print(<<ENDPICK);      $r->print(<<ENDPICK);
 </table>  </table>
 <input type=hidden name=nfields value=$i>  <input type=hidden name=nfields value=$i>
Line 482  $locform Line 450  $locform
 <h3>LON-CAPA Domain for Students</h3>  <h3>LON-CAPA Domain for Students</h3>
 LON-CAPA domain: $domform <p>  LON-CAPA domain: $domform <p>
 <h3>Starting and Ending Dates</h3>  <h3>Starting and Ending Dates</h3>
 <input type="hidden" value=''          name="pres_value"  >  <p>
 <input type="hidden" value=''          name="pres_type"   >  $date_table
 <input type="hidden" value=''          name="pres_marker" >  </p>
 <input type="hidden" value='$today'    name="startdate"   >  
 <input type="hidden" value='$halfyear' name="enddate"     >  
 <a   
  href="javascript:pjump('date_start','Enrollment Starting Date',document.studentform.startdate.value,'start','studentform.pres','dateset');"  
 >Set Starting Date</a><p>  
   
 <a   
  href="javascript:pjump('date_end','Enrollment Ending Date',document.studentform.enddate.value,'end','studentform.pres','dateset');"  
 >Set Ending Date</a><p>  
 <h3>Full Update</h3>  <h3>Full Update</h3>
 <input type=checkbox name=fullup value=yes> Full update   <input type=checkbox name=fullup value=yes> Full update 
 (also print list of users not enrolled anymore)<p>  (also print list of users not enrolled anymore)<p>
Line 520  sub print_upload_manager_form { Line 479  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 557  sub print_upload_manager_form { Line 515  sub print_upload_manager_form {
 # ======================================================= Enroll single student  # ======================================================= Enroll single student
 sub enroll_single_student {  sub enroll_single_student {
     my $r=shift;      my $r=shift;
       #
       # We do the dates first because the action of making them the defaul
       # in the course is entirely seperate from the action of enrolling the
       # student.  Also, a failure in setting the dates as default is not fatal
       # to the process of enrolling / modifying a student.
       my ($startdate,$enddate) = &get_dates_from_form();
       if ($ENV{'form.makedatesdefault'}) {
           $r->print(&make_dates_default($startdate,$enddate));
       }
   
     $r->print('<h3>Enrolling Student</h3>');      $r->print('<h3>Enrolling Student</h3>');
     $r->print('<p>Enrolling '.$ENV{'form.cuname'}." \@ ".      $r->print('<p>Enrolling '.$ENV{'form.cuname'}." \@ ".
               $ENV{'form.lcdomain'}.'</p>');                $ENV{'form.lcdomain'}.'</p>');
Line 603  sub enroll_single_student { Line 571  sub enroll_single_student {
                  $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 623  sub enroll_single_student { Line 591  sub enroll_single_student {
     }          }    
 }  }
   
   sub setup_date_selectors {
       my ($starttime,$endtime) = @_;
       if (! defined($starttime)) {
           $starttime = time;
           if (exists($ENV{'course.'.$ENV{'request.course.id'}.
                               '.default_enrollment_start_date'})) {
               $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'}.
                               '.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);
       return ($startdateform,$enddateform);
   }
   
   sub get_dates_from_form {
       my $startdate = &Apache::lonhtmlcommon::get_date_from_form('startdate');
       my $enddate   = &Apache::lonhtmlcommon::get_date_from_form('enddate');
       if ($ENV{'form.no_end_date'}) {
           $enddate = 0;
       }
       return ($startdate,$enddate);
   }
   
   sub date_setting_table {
       my ($starttime,$endtime) = @_;
       my ($startform,$endform)=&setup_date_selectors($starttime,$endtime);
       my $dateDefault = '<nobr>'.
           '<input type="checkbox" name="makedatesdefault" />'.
           ' make these dates the default for future enrollment';
       my $perpetual = '<nobr><input type="checkbox" name="no_end_date"';
       if (defined($endtime) && $endtime == 0) {
           $perpetual .= ' checked';
       }
       $perpetual.= ' />'.' no ending date</nobr>';
       my $result = '';
       $result .= "<table>\n";
       $result .= '<tr><td align="right">Starting Date</td>'.
           '<td>'.$startform.'</td>'.
           '<td>'.$dateDefault.'</td>'."</tr>\n";
       $result .= '<tr><td align="right">Ending Date</td>'.
           '<td>'.$endform.'</td>'.
           '<td>'.$perpetual.'</td>'."</tr>\n";
       $result .= "</table>\n";
       return $result;
   }
   
   sub make_dates_default {
       my ($startdate,$enddate) = @_;
       my $result = '';
       my $dom = $ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
       my $crs = $ENV{'course.'.$ENV{'request.course.id'}.'.num'};
       my $put_result = &Apache::lonnet::put('environment',
               {'default_enrollment_start_date'=>$startdate,
                'default_enrollment_end_date'  =>$enddate},$dom,$crs);
       if ($put_result eq 'ok') {
           $result .= "Set default start and end dates for course<br />";
       } else {
           $result .= "Unable to set default dates for course:".$put_result.
               '<br />';
       }
       return $result;
   }
   
 # ======================================================= Menu Phase Two Enroll  # ======================================================= Menu Phase Two Enroll
 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 $date_table = &date_setting_table();
     # 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 705  $locform Line 753  $locform
   
 <p>Group/Section: <input type="text" name="csec" size="5" />  <p>Group/Section: <input type="text" name="csec" size="5" />
 <p>  <p>
 <!-- Date setting form elements -->  $date_table
 <input type="hidden" name="pres_value"  value='' />  
 <input type="hidden" name="pres_type"   value='' />  
 <input type="hidden" name="pres_marker" value='' />  
 <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>  
 </p>  </p>
 <h3>ID/Student Number</h3>  <h3>ID/Student Number</h3>
 <p>  <p>
Line 771  END Line 806  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>
 </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 793  END Line 831  END
 }  }
   
 # ============================================== view classlist  # ============================================== view classlist
 sub print_csv_classlist {  sub print_formatted_classlist {
     my $r=shift;      my $r=shift;
       my $mode = shift;
     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)) {
         $r->print("There are no students currently enrolled.\n");          $r->print("There are no students currently enrolled.\n");
     } else {      } else {
         &show_class_list($r,'csv','nolink','csv',          &show_class_list($r,$mode,'nolink','csv',
                          $ENV{'form.Status'},$classlist,$keylist);                           $ENV{'form.Status'},$classlist,$keylist);
     }      }
 }  }
Line 809  sub print_csv_classlist { Line 848  sub print_csv_classlist {
 sub show_class_list {  sub show_class_list {
     my ($r,$mode,$linkto,$action,$statusmode,$classlist,$keylist)=@_;      my ($r,$mode,$linkto,$action,$statusmode,$classlist,$keylist)=@_;
     my $cid=$ENV{'request.course.id'};      my $cid=$ENV{'request.course.id'};
 #    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},      #
 #                                            ['sortby']);      # Variables for excel output
       my ($excel_workbook, $excel_sheet, $excel_filename,$row);
       #
     my $sortby = $ENV{'form.sortby'};      my $sortby = $ENV{'form.sortby'};
     if ($sortby !~ /^(username|domain|section|fullname|id)$/) {      if ($sortby !~ /^(username|domain|section|fullname|id)$/) {
         $sortby = 'username';          $sortby = 'username';
Line 853  END Line 894  END
             $r->print('"'.join('","',("username","domain","ID","student name",              $r->print('"'.join('","',("username","domain","ID","student name",
                                       "section")).'"'."\n");                                        "section")).'"'."\n");
         }          }
       } elsif ($mode eq 'excel') {
           # Create the excel spreadsheet
           $excel_filename = '/prtspool/'.
               $ENV{'user.name'}.'_'.$ENV{'user.domain'}.'_'.
                   time.'_'.rand(1000000000).'.xls';
           $excel_workbook = Spreadsheet::WriteExcel->new('/home/httpd'.
                                                          $excel_filename);
           $excel_workbook->set_tempdir('/home/httpd/perl/tmp');
           $excel_sheet = $excel_workbook->addworksheet('classlist');
           #
           my $description = 'Classlist for '.
               $ENV{'course.'.$ENV{'request.course.id'}.'.description'};
           $excel_sheet->write($row++,0,$description);
           #
           $excel_sheet->write($row++,0,["username","domain","ID",
                                         "student name","section","status"]);
     }      }
     #      #
     # Sort the students      # Sort the students
Line 917  END Line 974  END
             $" = '","';              $" = '","';
             $r->print("\"@line\"\n");              $r->print("\"@line\"\n");
             $" = $tmp;              $" = $tmp;
           } elsif ($mode eq 'excel') {
               $excel_sheet->write($row++,0,[$username,$domain,$id,
                                             $name,$section,$status]);
         }          }
     }      }
     $r->print('</table><br>') if ($mode eq 'view');      if ($mode eq 'view') {
           $r->print('</table><br>');
       } elsif ($mode eq 'excel') {
           $excel_workbook->close();
           $r->print('<p><a href="'.$excel_filename.'">'.
                     'Your Excel spreadsheet</a> is ready for download.</p>'."\n");
       }
 }  }
   
   
Line 951  sub print_modify_student_form { Line 1017  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);
     # Deal with date forms      # Deal with date forms
     my $startdateform = &Apache::lonhtmlcommon::date_setter('studentform',      my $date_table = &date_setting_table($starttime,$endtime);
                                                             'startdate',  
                                                             $starttime);  
     my $enddateform = &Apache::lonhtmlcommon::date_setter('studentform',  
                                                           'enddate',  
                                                           $endtime);  
     #      #
     if (! exists($ENV{'form.Status'}) ||       if (! exists($ENV{'form.Status'}) || 
         $ENV{'form.Status'} !~ /^(Any|Expired|Active)$/) {          $ENV{'form.Status'} !~ /^(Any|Expired|Active)$/) {
Line 996  Disable ID/Student Number Safeguard and Line 1057  Disable ID/Student Number Safeguard and
 (only do if you know what you are doing)  (only do if you know what you are doing)
 </p><p>  </p><p>
 <b>Section</b>: <input type="text" name="section" value="$section" size="4"/>  <b>Section</b>: <input type="text" name="section" value="$section" size="4"/>
 </p><p>  
 <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>  </p>
   <p>$date_table</p>
 <input type="submit" value="Submit Modifications" />  <input type="submit" value="Submit Modifications" />
 </body></html>  </body></html>
 END  END
Line 1013  END Line 1070  END
 #  #
 sub modify_single_student {  sub modify_single_student {
     my $r = shift;      my $r = shift;
       #
       # Do the date defaults first
       my ($starttime,$endtime) = &get_dates_from_form();
       if ($ENV{'form.makedatesdefault'}) {
           $r->print(&make_dates_default($starttime,$endtime));
       }
     # Get the 'sortby' and 'Status' variables so the user goes back to their      # Get the 'sortby' and 'Status' variables so the user goes back to their
     # previous screen      # previous screen
     my $sortby = $ENV{'form.sortby'};      my $sortby = $ENV{'form.sortby'};
Line 1045  sub modify_single_student { Line 1108  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',  
                                                                time);  
     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 1098  sub modify_single_student { Line 1158  sub modify_single_student {
 </table>  </table>
 <h3>Role Information</h3>  <h3>Role Information</h3>
 <table>  <table>
 <tr><td>Start Time  </td><td> $displayable_starttime </td></tr>  <tr><td align="right"><b>Start Time:</b></td><td> $displayable_starttime </td></tr>
 <tr><td>End Time    </td><td> $displayable_endtime   </td></tr>  <tr><td align="right"><b>End Time:</b></td><td> $displayable_endtime   </td></tr>
 </table>  </table>
 <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'});
Line 1150  sub get_enrollment_data { Line 1218  sub get_enrollment_data {
     my $section = '';      my $section = '';
     my $count = scalar(keys(%roles));      my $count = scalar(keys(%roles));
     while (my ($course,$role) = each(%roles)) {      while (my ($course,$role) = each(%roles)) {
         &Apache::lonnet::logthis('course = '.$course.' role = '.$role);  
         if ($course=~ /^\/$courseid\/*\s*(\w+)*_st$/ ) {          if ($course=~ /^\/$courseid\/*\s*(\w+)*_st$/ ) {
             #              #
             # Get active role              # Get active role
Line 1354  sub upfile_drop_add { Line 1421  sub upfile_drop_add {
         }          }
     }      }
     #      #
     my $startdate = $ENV{'form.startdate'};      my ($startdate,$enddate) = &get_dates_from_form();
     my $enddate   = $ENV{'form.enddate'};      if ($ENV{'form.makedatesdefault'}) {
     if ($startdate=~/\D/) { $startdate=''; }          $r->print(&make_dates_default($startdate,$enddate));
     if ($enddate=~/\D/)   { $enddate=''; }      }
     # Determine domain and desired host (home server)      # Determine domain and desired host (home server)
     my $domain=$ENV{'form.lcdomain'};      my $domain=$ENV{'form.lcdomain'};
     my $desiredhost = $ENV{'form.lcserver'};      my $desiredhost = $ENV{'form.lcserver'};
Line 1638  sub handler { Line 1705  sub handler {
         if (! exists($ENV{'form.state'})) {          if (! exists($ENV{'form.state'})) {
             &print_html_classlist($r);              &print_html_classlist($r);
         } elsif ($ENV{'form.state'} eq 'csv') {          } elsif ($ENV{'form.state'} eq 'csv') {
             &print_csv_classlist($r);              &print_formatted_classlist($r,'csv');
           } elsif ($ENV{'form.state'} eq 'excel') {
               &print_formatted_classlist($r,'excel');
         } else {          } else {
             &print_html_classlist($r);              &print_html_classlist($r);
         }          }
Removed from v.1.59  
changed lines
  Added in v.1.68

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