Diff for /loncom/interface/lonpopulate.pm between versions 1.15 and 1.20

version 1.15, 2004/06/28 15:41:20 version 1.20, 2004/09/13 16:21:30
Line 35  use Apache::loncoursedata; Line 35  use Apache::loncoursedata;
 use Apache::Constants qw(:common :http REDIRECT);  use Apache::Constants qw(:common :http REDIRECT);
 use Time::Local;  use Time::Local;
 use LONCAPA::Enrollment;  use LONCAPA::Enrollment;
 use localenroll;  
   
 ###############################################################  ###############################################################
 sub header {  sub header {
Line 52  ENDHEAD Line 51  ENDHEAD
 ###############################################################  ###############################################################
   
 sub choose_header {  sub choose_header {
       my $action = shift;
     my $bodytag=&Apache::loncommon::bodytag('Classlist Manager');      my $bodytag=&Apache::loncommon::bodytag('Classlist Manager');
     my $scripttag = qq|      my $scripttag = qq|
 <script language='javascript' type='text/javascript'>  <script language='javascript' type='text/javascript'>
 <!--  <!--
 function process(calling) {  function process(calling,numauto,nummanual,numlock,numunlock) {
  var checker = 1   var checker = 1
  var rad1 = 0   var rad1 = 0
  var rad2 = 0   var rad2 = 0
Line 77  function process(calling) { Line 77  function process(calling) {
        }         }
    }     }
    if (rad1 == 0) {     if (rad1 == 0) {
        alert("You must check either 'Enable' or 'Disable' for nightly additions based on classlist changes")         alert("You must select either 'Enable' or 'Disable' for nightly additions based on classlist changes")
        checker = 0         checker = 0
    }     }
    if (rad2 == 0) {     if (rad2 == 0) {
        alert("You must check either 'Enable' or 'Disable' for nightly removals based on classlist changes")         alert("You must select either 'Enable' or 'Disable' for nightly removals based on classlist changes")
        checker = 0         checker = 0
    }     }
  }   }
Line 105  function process(calling) { Line 105  function process(calling) {
          }           }
      }       }
      if (rad1 == 0) {       if (rad1 == 0) {
          alert("You must check either 'Enable' or 'Disable' for nightly additions based on classlist changes")           alert("You must select either 'Yes' or 'No' for immediate addition of newly registered students to the roster")
          checker = 0           checker = 0
      }       }
      if (rad2 == 0) {       if (rad2 == 0) {
          alert("You must check either 'Enable' or 'Disable' for nightly removals based on classlist changes")           alert("You must select either 'Yes' or 'No' for immediate removal of unregistered students from the roster")
          checker = 0           checker = 0
      }       }
      if (formName.updatedrops[unenrolldis].checked && formName.updateadds[enrolldis].checked ) {       if (formName.updatedrops[unenrolldis].checked && formName.updateadds[enrolldis].checked ) {
          alert("You have checked 'Disable' for both addition and removal of students\\n in the Registrar's classlist but not in your LON-CAPA course.  \\nHence there is no update to carry out")           alert("You have selected 'No' for both addition and removal of students\\n in the Registrar's classlist but not in your LON-CAPA course.  \\nHence there is no update to carry out")
          checker = 0           checker = 0
      }       }
  }   }
  if (calling == "viewclass") {   if (calling == "viewclass") {
      document.forms.studentform.state.value = "process";       var totcheck = 0
      checker = 1;           var numchk = 0
        if (numauto > 0) {
            numchk = countChecked(document.studentform.chgauto);
            totcheck = totcheck + numchk
        }
        if (nummanual > 0) {
            numchk = countChecked(document.studentform.chgmanual);
            totcheck = totcheck + numchk
        }
        if (numlock > 0) {
            numchk = countChecked(document.studentform.lockchg);
            totcheck = totcheck + numchk
        }
        if (numunlock > 0) {
            numchk = countChecked(document.studentform.unlockchg);
            totcheck = totcheck + numchk
        }
        if (totcheck > 0) {
           document.forms.studentform.state.value = "process";
        }
        if (totcheck == 0) {
           alert("You must check at least one checkbox, before proceeding to the next page")
           checker = 0
        }
  }    } 
  if (checker == 1) {     if (checker == 1) {  
      formName.submit();       formName.submit();
  }   }
 }  }
   |;
       if ($action eq 'viewclass') {
           $scripttag .= qq|
   function checkAll(field) {
       if (field.length > 0) {
           for (i = 0; i < field.length; i++) {
               field[i].checked = true ;
           }
       } else {
           field.checked = true
       }
   }
   
   function uncheckAll(field) {
       if (field.length > 0) {
           for (i = 0; i < field.length; i++) {
               field[i].checked = false ;
           }
       } else {
           field.checked = false ;
       }
   }
   
   function countChecked(field) {
       var count = 0;
       if (field.length > 0) {
           for (var i=0; i<field.length; i++) {
               if (field[i].checked == true) {
                   count ++
               }
           }
       } else {
           if (field.checked == true) {
               count ++
           }
       }
       return count
   }
   
   |;
       }
       $scripttag .= qq|
 // End hiding -->  // End hiding -->
 </script>  </script>
 |;  |;
Line 241  sub print_main_frame { Line 306  sub print_main_frame {
               <td><b>Use the menu on the left to choose an enrollment management task.</b><br/><br/></td>                <td><b>Use the menu on the left to choose an enrollment management task.</b><br/><br/></td>
             <tr>              <tr>
               <td>&nbsp;</td>                <td>&nbsp;</td>
               <td>Use <i>"Automated adds/drops"</i> to enable or disable automatic nightly adds or drops in your LON-CAPA course based on instututional enrollment information.</td>                <td>Use <i>"Automated adds/drops"</i> to enable or disable automatic nightly adds or drops in your LON-CAPA course based on institutional enrollment information.</td>
             </tr>              </tr>
             <tr>              <tr>
               <td>&nbsp;</td>                <td>&nbsp;</td>
Line 271  sub print_main_frame { Line 336  sub print_main_frame {
               <td>Use <i>"Update roster now"</i> to add and/or drop students from your course based on the <b>most current</b> institutional classlist information.</td>                <td>Use <i>"Update roster now"</i> to add and/or drop students from your course based on the <b>most current</b> institutional classlist information.</td>
             </tr>              </tr>
             <tr>              <tr>
                 <td>&nbsp;</td>
                 <td>Use <i>"View students and change type"</i> to display the current course roster, and (optionally) change enrollment type for selected students from 'auto' to 'manual' and vice versa.</td>
               </tr>
               <tr>
              <td colspan='2'>&nbsp;</td>               <td colspan='2'>&nbsp;</td>
             </tr>              </tr>
             <tr>              <tr>
Line 878  Note: if you enable automatic import of Line 947  Note: if you enable automatic import of
    <table width=\"100%\" border=\"0\" cellpadding=\"3\" cellspacing=\"3\">     <table width=\"100%\" border=\"0\" cellpadding=\"3\" cellspacing=\"3\">
     <tr>      <tr>
      <td>       <td>
               Add any students currently included in institutional classlist(s) but not enrolled in your LON-CAPA course.                 Add any students currently included in institutional classlist(s) but not enrolled in your LON-CAPA course.<br />  
       <input type=\"radio\" name=\"updateadds\" value=\"1\">&nbsp;Yes&nbsp;        <input type=\"radio\" name=\"updateadds\" value=\"1\">&nbsp;Yes&nbsp;<input type=\"radio\" name=\"updateadds\" value=\"0\">&nbsp;No&nbsp;
       <input type=\"radio\" name=\"updateadds\" value=\"0\">&nbsp;No&nbsp;  
                      </td>                       </td>
                     </tr>                      </tr>
                     <tr>                      <tr>
                      <td>                       <td>
                Expire students previously added by nightly enrollment process, but no longer listed in institutional  classlist(s).                                   Expire students previously added by nightly enrollment process, but no longer listed in institutional  classlist(s).<br />                  
                       <input type=\"radio\" name=\"updatedrops\" value=\"1\">&nbsp;Yes&nbsp;                        <input type=\"radio\" name=\"updatedrops\" value=\"1\">&nbsp;Yes&nbsp;
                       <input type=\"radio\" name=\"updatedrops\" value=\"0\">&nbsp;No&nbsp;<br/>                        <input type=\"radio\" name=\"updatedrops\" value=\"0\">&nbsp;No&nbsp;<br/>
                      </td>                       </td>
Line 921  Note: Any students previously added manu Line 989  Note: Any students previously added manu
                      <td align=\"left\"><b>$$tasktitleref{$action}</b>                       <td align=\"left\"><b>$$tasktitleref{$action}</b>
                      </td>                       </td>
                     </tr>                      </tr>
                       <tr>
                        <td>Section changes, name changes, and class drops that can be set to occur either automatically or when using the <b>'Update roster now'</b> feature, will affect only those students with an enroll type of <b>'auto'</b>. Students with an enroll type of <b>'manual'</b>, will be converted automatically to the 'auto' type, when they first appear in the institutional classlist for the course - as long as nightly adds are enabled and active, or the update roster utility is used.  Use the 'Lock' checkbox for any manually enrolled students for whom you wish to prevent type conversion. Use the 'Change' checkbox to switch the enroll type from auto to manual, and vice versa. Use the 'Unlock' checkbox for any maually enrolled students for whom you no longer wish to lock the enroll type.  Click the 'Go' button at the end of the page to process your desired changes.</td>
                       </tr>
                       <tr><td>&nbsp;</td></tr> 
                    </table>                     </table>
                    <table>                     <table>
                     <tr>                      <tr>
Line 943  Note: Any students previously added manu Line 1015  Note: Any students previously added manu
           $r->print('<input type="submit" value="'.&mt('Update Display').'" />'.            $r->print('<input type="submit" value="'.&mt('Update Display').'" />'.
               "\n</p>\n");                "\n</p>\n");
   
           my $studentcount = &Apache::londropadd::show_class_list($r,'autoenroll','nothing',$ENV{'form.Status'},$classlist,$keylist);            my ($studentcount,$autocount,$manualcount,$lockcount,$unlockcount) = &Apache::londropadd::show_class_list($r,'autoenroll','nothing',$ENV{'form.Status'},$classlist,$keylist);
           $r->print("            $r->print("
                      </td>                       </td>
                     </tr>                      </tr>
           ");            ");
           if ($studentcount > 0) {            if ($studentcount > 0) {
               $r->print("                $r->print("
                     <tr>                      <tr><td><table border=\"0\" cellpadding=\"5\"><tr>
                 ");
                 my $cellcount = 0;
                 if ($autocount > 0) {
                     $cellcount ++;
                     $r->print(<<END);
                          <td><fieldset><legend>&nbsp;<b>Change auto</b></legend><input type="button" value="check all" onclick="javascript:checkAll(document.studentform.chgauto)" />&nbsp;&nbsp;
                          <input type="button" value="uncheck all" onclick="javascript:uncheckAll(document.studentform.chgauto)" /></fieldset></td>
   END
                 }
                 if ($manualcount > 0) {
                     $cellcount ++;
                     $r->print(<<END);
                          <td><fieldset><legend>&nbsp;<b>Change manual</b></legend><input type="button" value="check all" onclick="javascript:checkAll(document.studentform.chgmanual)" />&nbsp;&nbsp;
                          <input type="button" value="uncheck all" onclick="javascript:uncheckAll(document.studentform.chgmanual)" /></fieldset></td>
   END
                 }
                 if ($lockcount > 0) {
                     if ($cellcount == 2) {
                         $r->print("</tr><tr>");
                     }
                     $cellcount ++;
                     $r->print(<<END);
                          <td><fieldset><legend>&nbsp;<b>Lock manual</b></legend><input type="button" value="check all" onclick="javascript:checkAll(document.studentform.lockchg)" />&nbsp;&nbsp;
                          <input type="button" value="uncheck all" onclick="javascript:uncheckAll(document.studentform.lockchg)" /></fieldset></td>
   END
                 }
                 if ($unlockcount > 0) {
                     if ($cellcount == 2) {
                         $r->print("</tr><tr>");
                     }
                     $cellcount ++;
                     $r->print(<<END);
                          <td><fieldset><legend>&nbsp;<b>Unlock manual</b></legend><input type="button" value="check all" onclick="javascript:checkAll(document.studentform.unlockchg)" />&nbsp;&nbsp;
                          <input type="button" value="uncheck all" onclick="javascript:uncheckAll(document.studentform.unlockchg)" /></fieldset></td>
   END
                 }
                 $r->print("
                          </tr>
                         </table>
                      <td>&nbsp;</td>                       <td>&nbsp;</td>
                     </tr>                      </tr>
                     <tr>                      <tr>
                      <td align=\"right\">                       <td align=\"right\">
                       <input type=\"button\" name=\"viewclass\" value=\"Go\" onClick=\"process('viewclass')\" />                        <input type=\"button\" name=\"viewclass\" value=\"Go\" onClick=\"process('viewclass','$autocount','$manualcount','$lockcount','$unlockcount')\" />
                      </td>                       </td>
                     </tr>                      </tr>
               ");                ");
Line 992  sub print_accessdate_table { Line 1103  sub print_accessdate_table {
          'setl' => 'Set date of last access',           'setl' => 'Set date of last access',
          'freg' => 'for registered students added via automated enrollment',           'freg' => 'for registered students added via automated enrollment',
          'fnew' => 'for new students added when you update the class roster',           'fnew' => 'for new students added when you update the class roster',
          'ifad'  => 'If automated adds are enabled, then when students are added their student roles will become active on the date set here for first access, and their roles will become inactive on the date set here for last access.  These default access dates will be overridden for specific students if the institutional classlist data supplied to the automatic enrollment process includes entries for the startdate and enddate fields for those students.'           'ifad'  => 'If automated adds are enabled, then when students are added their student roles will become active on the date set here for first access, and their roles will become inactive on the date set here for last access.  These default access dates will be overridden for specific students if the institutional classlist data supplied to the automatic enrollment process includes entries for the startdate and enddate fields for those students.',
            'ncds'  => 'changing default start and end access dates will affect future enrollments and ALSO currently inactive students (i.e., those for whom access will begin in the future).  To change access dates for currently active students, you should change the access dates via this screen, then use Enrollment manager -> Drop Students to drop the students, and then use Automated Enrollment Manager -> Update roster now to re-enroll them with the new access dates.'
   
     );      );
     my $dateshow;      my $dateshow;
     if ( ($oldendshow eq '') && ($oldstartshow eq '') ) {      if ( ($oldendshow eq '') && ($oldstartshow eq '') ) {
Line 1071  ENDFOUR Line 1184  ENDFOUR
                    <tr>                     <tr>
                     <td colspan=\"2\"><font color=\"#888888\">$lt{'ifad'}</font></td>                      <td colspan=\"2\"><font color=\"#888888\">$lt{'ifad'}</font></td>
                    </tr>                     </tr>
                      <tr>
                       <td colspan=\"2\">&nbsp;</td>
                      </tr>
                      <tr>
                       <td colspan=\"2\"><b>".&mt('Note').":</b> ".$lt{'ncds'}."</td>
                      </tr>
                   </table>                    </table>
         ");          ");
     } elsif ($action eq 'updatenow') {      } elsif ($action eq 'updatenow') {
Line 1199  sub print_setdates_response { Line 1318  sub print_setdates_response {
     my $currstart = $settings{'internal.autostart'};      my $currstart = $settings{'internal.autostart'};
     my $currend = $settings{'internal.autoend'};      my $currend = $settings{'internal.autoend'};
     my $response = '';      my $response = '';
     my ($autostart,$autoend) = &get_dates_from_form();      my $showstart = '';
     my $showstart = &Apache::lonlocal::locallocaltime($autostart);  
     my $showend = '';      my $showend = '';
     my $warning = '';      my $warning = '';
     my $warn_prefix = '';      my $warn_prefix = '';
     if ($autoend) {      my ($autostart,$autoend) = &get_dates_from_form();
  $showend = &Apache::lonlocal::locallocaltime($autoend);      if ( ($autostart eq '') || ($autoend eq '') ) {
     } else {          $response = "There was a problem processing your requested changes. The automated enrollment settings for this course have been left unchanged.<br/>";
  $showend = "'No end date'";      } elsif (($autoend > 0) && ($autoend <= $autostart)) {
     }           $response = 'The date/time selected for starting auto-enrollment was the same or later than the date/time selected for ending auto-enrollment. As this means auto-enrollment will never be active, your requested changes have not been processed, and the existing values remain in effect. Please <a href="javascript:history.go(-1)">go back</a> to the previous page to try your changes again.'."\n";
       } else {       
           $showstart = &Apache::lonlocal::locallocaltime($autostart);
           if ($autoend) {
       $showend = &Apache::lonlocal::locallocaltime($autoend);
           } else {
       $showend = "'No end date'";
           } 
   
     my %cenv = ('internal.autostart' => $autostart,          my %cenv = ('internal.autostart' => $autostart,
  'internal.autoend' => $autoend);       'internal.autoend' => $autoend);
     my $reply = &Apache::lonnet::put('environment',\%cenv,$dom,$crs);          my $reply = &Apache::lonnet::put('environment',\%cenv,$dom,$crs);
     if ($reply !~ /^ok$/) {          if ($reply !~ /^ok$/) {
  $response = "There was a problem processing your requested changes. The automated enrollment settings for this course have been left unchanged.<br/>";      $response = "There was a problem processing your requested changes. The automated enrollment settings for this course have been left unchanged.<br/>";
     } else {          } else {
  if ($currstart == $autostart) {      if ($currstart == $autostart) {
     $response = "The first date for automated enrollment has been left unchanged as $showstart.<br/>";          $response = "The first date for automated enrollment has been left unchanged as $showstart.<br/>";
  } else {      } else {
     $response = "The first date for automated enrollment has been changed to $showstart.<br/>";          $response = "The first date for automated enrollment has been changed to $showstart.<br/>";
  }       } 
  if ($currend == $autoend) {      if ($currend == $autoend) {
     $response .= "The last date for automated enrollment has been left unchanged as $showend.<br/>";          $response .= "The last date for automated enrollment has been left unchanged as $showend.<br/>";
  } else {      } else {
     $response .= "The last date for automated enrollment has been changed to $showend.<br/>";          $response .= "The last date for automated enrollment has been changed to $showend.<br/>";
  }      }
     
 # Generate message in case where old first enrollment date was later than today, but new first enrollment date is now today or earlier.  # Generate message in case where old first enrollment date was later than today, but new first enrollment date is now today or earlier.
   
  my $rosterupdated = 0;      my $rosterupdated = 0;
  my $firstaccess = "";      my $firstaccess = "";
  my $nextupdate = "";      my $nextupdate = "";
  my $lastupdate = "";      my $lastupdate = "";
   
  my $nowstamp = time;      my $nowstamp = time;
  my @date_list=localtime(time);      my @date_list=localtime(time);
  my $cur_year = $date_list[5];      my $cur_year = $date_list[5];
  my $curday = $date_list[3];      my $curday = $date_list[3];
  my $curmonth = $date_list[4];      my $curmonth = $date_list[4];
  my $lastmidnt = timelocal(0,0,0,$date_list[3],$date_list[4],$date_list[5]);      my $lastmidnt = timelocal(0,0,0,$date_list[3],$date_list[4],$date_list[5]);
  my $nextmidnt = 86400 + $lastmidnt;      my $nextmidnt = 86400 + $lastmidnt;
   
  my $todayupdate = timelocal(0,30,1,$date_list[3],$date_list[4],$date_list[5]);      my $todayupdate = timelocal(0,30,1,$date_list[3],$date_list[4],$date_list[5]);
  my $lastupdate = $todayupdate - 86400;      my $lastupdate = $todayupdate - 86400;
  if ($nowstamp < $todayupdate) {      if ($nowstamp < $todayupdate) {
     $nextupdate = "today";        $nextupdate = "today";
  } else {  
     $nextupdate = "tomorrow";  
  }  
  if ($currstart < $lastupdate) {  
     $rosterupdated = 1;  
  }  
  if ($autostart < $nextmidnt ) {  
     if ( $autostart >= $lastmidnt) {  
  $firstaccess = "today";  
     } else {      } else {
  $firstaccess = "a date prior to today";        $nextupdate = "tomorrow";
     }      }
     if (($nowstamp >= $autostart) && ($rosterupdated == 0)) {      if ($currstart < $lastupdate) {
  $response .= qq|<br>Although you have now set the first enrollment date to $firstaccess, automatic enrollment will <b>not</b> occur until the next automatic enrollment update occurs for all LON-CAPA courses at 1.30 am $nextupdate. If you wish to immediately enroll registered students included in the institutional classlist for this class, please visit the <a href="/adm/populate?action=updatenow">roster update page</a>.<br>|;          $rosterupdated = 1;
     }      }
  }      if ($autostart < $nextmidnt ) {
  $warning = &warning_message($dom,$crs,$action);          if ( $autostart >= $lastmidnt) {
  $warn_prefix = "<br/><font size ='+1'><b>Warning</b></font>. Although you set a start and end date for auto-enrollment, additional action is required.<br/>";      $firstaccess = "today";
  unless ($warning eq '') {          } else {
     $response .= $warn_prefix.$warning;        $firstaccess = "a date prior to today";
  }          }
           if (($nowstamp >= $autostart) && ($rosterupdated == 0)) {
       $response .= qq|<br>Although you have now set the first enrollment date to $firstaccess, automatic enrollment will <b>not</b> occur until the next automatic enrollment update occurs for all LON-CAPA courses at 1.30 am $nextupdate. If you wish to immediately enroll registered students included in the institutional classlist for this class, please visit the <a href="/adm/populate?action=updatenow">roster update page</a>.<br>|;
           }
       }
       $warning = &warning_message($dom,$crs,$action);
       $warn_prefix = "<br/><font size ='+1'><b>Warning</b></font>. Although you set a start and end date for auto-enrollment, additional action is required.<br/>";
       unless ($warning eq '') {
           $response .= $warn_prefix.$warning;
       }
           }
     }      }
     &print_reply($r,$response,$$tasktitleref{$action});      &print_reply($r,$response,$$tasktitleref{$action});
     return;      return;
Line 1280  sub print_setaccess_response { Line 1406  sub print_setaccess_response {
     my $autostart = $settings{'internal.autostart'};      my $autostart = $settings{'internal.autostart'};
     my $response = '';      my $response = '';
     my ($startaccess,$endaccess) = &get_dates_from_form();      my ($startaccess,$endaccess) = &get_dates_from_form();
     my $showstart = &Apache::lonlocal::locallocaltime($startaccess);      if (($startaccess eq '') || ($endaccess eq '')) {
     my $showend = '';          $response = "There was a problem processing your requested changes. The default
     my $warning = '';  start and end access dates for this course have been left unchanged.<br/>";
     my $warn_prefix = '';      } elsif (($endaccess > 0) && ($endaccess <= $startaccess)) {
     if ($endaccess) {          $response = 'The default start access date/time you chose was the same or later than the default end access date/time. As this means that roles will never be active, your requested changes have not been processed, and the existing values remain in effect. Please <a href="javascript:history.go(-1)">go back</a> to the previous page to try your changes again.'."\n"; 
  $showend = &Apache::lonlocal::locallocaltime($endaccess);  
     } else {      } else {
  $showend = "'No end date'";          my $showstart = &Apache::lonlocal::locallocaltime($startaccess);
     }          my $showend = '';
           my $warning = '';
           my $warn_prefix = '';
           if ($endaccess) {
       $showend = &Apache::lonlocal::locallocaltime($endaccess);
           } else {
       $showend = "'No end date'";
           }
   
     my %cenv = ('default_enrollment_start_date' => $startaccess,          my %cenv = ('default_enrollment_start_date' => $startaccess,
  'default_enrollment_end_date' => $endaccess);   'default_enrollment_end_date' => $endaccess);
     my $reply = &Apache::lonnet::put('environment',\%cenv,$dom,$crs);          my $reply = &Apache::lonnet::put('environment',\%cenv,$dom,$crs);
     if ($reply !~ /^ok$/) {          if ($reply !~ /^ok$/) {
  $response = "There was a problem processing your requested changes. The automated enrollment settings for this course have been left unchanged.<br/>";      $response = "There was a problem processing your requested changes. The automated enrollment settings for this course have been left unchanged.<br/>";
     } else {          } else {
  if ($currstart == $startaccess) {      if ($currstart == $startaccess) {
     $response = "The first access date for students added via automated enrollment has been left unchanged as $showstart.<br/>";          $response = "The first access date for students added via automated enrollment has been left unchanged as $showstart.<br/>";
  } else {      } else {
     $response = "The first access date for students added via automated enrollment has been changed to          $response = "The first access date for students added via automated enrollment has been changed to
 $showstart.<br/>";  $showstart.<br/>";
  }      }
  if ($currend == $endaccess) {      if ($currend == $endaccess) {
     $response .= "The last access date for students added via automated enrollment has been left unchanged as $showend.<br/>";          $response .= "The last access date for students added via automated enrollment has been left unchanged as $showend.<br/>";
  } else {      } else {
     $response .= "The last access date for students automated enrollment has been changed to          $response .= "The last access date for students automated enrollment has been changed to
 $showend.<br/>";  $showend.<br/>";
  }      }
   
 # Generate message in case where old first access date was later than today, but new first access date is now today or earlier.  # Generate message in case where old first access date was later than today, but new first access date is now today or earlier.
   
  my $accessgiven= 0;      my $accessgiven= 0;
  my $firstaccess = "";      my $firstaccess = "";
  my $nextupdate = "";      my $nextupdate = "";
  my $lastupdate = "";      my $lastupdate = "";
   
  my $nowstamp = time;      my $nowstamp = time;
  my @date_list=localtime(time);      my @date_list=localtime(time);
  my $cur_year = $date_list[5];      my $cur_year = $date_list[5];
  my $curday = $date_list[3];      my $curday = $date_list[3];
  my $curmonth = $date_list[4];      my $curmonth = $date_list[4];
  my $lastmidnt = timelocal(0,0,0,$date_list[3],$date_list[4],$date_list[5]);      my $lastmidnt = timelocal(0,0,0,$date_list[3],$date_list[4],$date_list[5]);
  my $nextmidnt = 86400 + $lastmidnt;      my $nextmidnt = 86400 + $lastmidnt;
   
  my $todayupdate = timelocal(0,30,1,$date_list[3],$date_list[4],$date_list[5]);      my $todayupdate = timelocal(0,30,1,$date_list[3],$date_list[4],$date_list[5]);
  my $tomorrowupdate = $todayupdate + 86400;      my $tomorrowupdate = $todayupdate + 86400;
  my $lastupdate = $todayupdate - 86400;      my $lastupdate = $todayupdate - 86400;
   
  if ($autostart < $nextmidnt) {      if ($autostart < $nextmidnt) {
     if ($nowstamp < $todayupdate) {          if ($nowstamp < $todayupdate) {
  $nextupdate = "at 1.30 am today";      $nextupdate = "at 1.30 am today";
           } else {
       $nextupdate = "at 1.30 am tomorrow";
           }
     } else {      } else {
  $nextupdate = "at 1.30 am tomorrow";          my @enrollstart = localtime($autostart);
           $nextupdate = timelocal(0,30,1,$enrollstart[3],$enrollstart[4],$enrollstart[5]);
           unless (($enrollstart[2] < 1) || ($enrollstart[2] == 1 && $enrollstart[1] <=30))  {
       $nextupdate += 86400; 
           }
           $nextupdate = &Apache::lonlocal::locallocaltime($nextupdate);
       }
       if (($currstart < $lastupdate) && ($autostart < $lastupdate)) {
           $accessgiven = 1;
       }
       if ($startaccess < $nextmidnt ) {
           if ( $startaccess >= $lastmidnt) {
           $firstaccess = "today";
           } else {
       $firstaccess = "a date prior to today";
           }
           if (($nowstamp >= $startaccess) && ($accessgiven == 0)) {
       $response .= qq|<br>Although you have now set the first access date to $firstaccess, automatic enrollment will <b>not</b> occur until the next automatic enrollment update occurs for all LON-CAPA courses $nextupdate. If you wish to grant immediate course access for registered students included in the institutional classlist for this class, please visit the <a href="/adm/populate?action=updatenow">roster update page</a>.<br>|;
           }
     }      }
  } else {      $warning = &warning_message($dom,$crs,$action);
     my @enrollstart = &Apache::lonlocal::locallocaltime($autostart);      $warn_prefix = "<br/><font size ='+1'><b>Warning</b></font>. Although you have set default first and last access dates for students who are added via automatic enrollment, additional action is required.<br/>";
     $nextupdate = timelocal(0,30,1,$enrollstart[3],$enrollstart[4],$enrollstart[5]);      unless ($warning eq '') {
     unless (($enrollstart[2] < 1) || ($enrollstart[2] == 1 && $enrollstart[1] <=30))  {          $response .= $warn_prefix.$warning;
  $nextupdate += 86400;   
     }  
     $nextupdate = &Apache::lonlocal::locallocaltime($nextupdate);  
  }  
  if (($currstart < $lastupdate) && ($autostart < $lastupdate)) {  
     $accessgiven = 1;  
  }  
  if ($startaccess < $nextmidnt ) {  
     if ( $startaccess >= $lastmidnt) {  
  $firstaccess = "today";  
     } else {  
  $firstaccess = "a date prior to today";  
     }  
     if (($nowstamp >= $startaccess) && ($accessgiven == 0)) {  
  $response .= qq|<br>Although you have now set the first access date to $firstaccess, automatic enrollment will <b>not</b> occur until the next automatic enrollment update occurs for all LON-CAPA courses $nextupdate. If you wish to grant immediate course access for registered students included in the institutional classlist for this class, please visit the <a href="/adm/populate?action=updatenow">roster update page</a>.<br>|;  
     }      }
  }          }
  $warning = &warning_message($dom,$crs,$action);  
  $warn_prefix = "<br/><font size ='+1'><b>Warning</b></font>. Although you have set default first and last access dates for students who are added via automatic enrollment, additional action is required.<br/>";  
  unless ($warning eq '') {  
     $response .= $warn_prefix.$warning;  
  }  
     }      }
     &print_reply($r,$response,$$tasktitleref{$action});      &print_reply($r,$response,$$tasktitleref{$action});
     return;      return;
Line 2002  sub print_update_result () { Line 2135  sub print_update_result () {
     my $authtype = $settings{'internal.authtype'};      my $authtype = $settings{'internal.authtype'};
     my $autharg = $settings{'internal.autharg'};      my $autharg = $settings{'internal.autharg'};
     my ($startaccess,$endaccess) = &get_dates_from_form();      my ($startaccess,$endaccess) = &get_dates_from_form();
       
     if ( exists($ENV{'form.updateadds'}) ) {      if ( exists($ENV{'form.updateadds'}) ) {
  $updateadds = $ENV{'form.updateadds'};          $updateadds = $ENV{'form.updateadds'};
     }      }
     if ( exists($ENV{'form.updatedrops'}) ) {      if ( exists($ENV{'form.updatedrops'}) ) {
  $updatedrops = $ENV{'form.updatedrops'};          $updatedrops = $ENV{'form.updatedrops'};
     }      }
     if (!$updateadds && !$updatedrops) {      if (($startaccess eq '') || ($endaccess eq '')) {
           $response = "There was a problem processing your requested roster update because start and and access dates could not be determined. No changes have been made to the class roster.<br />"; 
       } elsif ($updateadds && (($endaccess > 0) && ($endaccess <= $startaccess))) {
           $response = 'The start access date/time is the same or later than the end access date/time. As this means that new roles will never be active, your requested roster update has not been carried out, and the roster remains unchanged. Please <a href="javascript:history.go(-1)">go back</a> to the previous page to try your changes again.'."\n";
       } elsif (!$updateadds && !$updatedrops) {
  $response = "An update of the class roster has not been carried out because you indicated that you wanted to neither add new students, nor expire dropped students based on a comparison between the institutional class lists for the course sections and crosslisted courses that contribure enrollment to this LON-CAPA course.";   $response = "An update of the class roster has not been carried out because you indicated that you wanted to neither add new students, nor expire dropped students based on a comparison between the institutional class lists for the course sections and crosslisted courses that contribure enrollment to this LON-CAPA course.";
     } elsif ($coursecode eq '') {      } elsif ($coursecode eq '') {
  $response = "There was a problem retrieving the course code for this LON-CAPA course.  An update of the class roster has not been carried out, and enrollment remains unchanged";   $response = "There was a problem retrieving the course code for this LON-CAPA course.  An update of the class roster has not been carried out, and enrollment remains unchanged";
Line 2057  sub print_update_result () { Line 2193  sub print_update_result () {
  if (@allcourses > 0) {   if (@allcourses > 0) {
     @{$affiliates{$crs}} = @allcourses;      @{$affiliates{$crs}} = @allcourses;
     my $outcome = &Apache::lonnet::fetch_enrollment_query('updatenow',\%affiliates,\%reply,$dom,$crs);      my $outcome = &Apache::lonnet::fetch_enrollment_query('updatenow',\%affiliates,\%reply,$dom,$crs);
               unless ($outcome eq 'ok') {
                   &Apache::lonnet::logthis("lonpopulate:update roster".
                                            "failed to retrieve classlist".
                                    " data for ".$crs."\@".$dom." by ".
                                    $ENV{'user.name'}." \@ ".$ENV{'user.domain'}.
                                    ": ".$outcome);
               }
     if ($reply{$crs} > 0) {      if ($reply{$crs} > 0) {
  ($changecount,$response) = &LONCAPA::Enrollment::update_LC($dom,$crs,$updateadds,$updatedrops,$startaccess,$endaccess,$authtype,$autharg,\@allcourses,\%LC_code,\$logmsg,\$newusermsg,"updatenow");   ($changecount,$response) = &LONCAPA::Enrollment::update_LC($dom,$crs,$updateadds,$updatedrops,$startaccess,$endaccess,$authtype,$autharg,\@allcourses,\%LC_code,\$logmsg,\$newusermsg,"updatenow");
     } else {      } else {
Line 2073  sub print_update_result () { Line 2216  sub print_update_result () {
     }      }
     unless ($newusermsg eq '') {      unless ($newusermsg eq '') {
  $newusermsg = substr( $newusermsg,0,rindex($newusermsg,'<li>') );   $newusermsg = substr( $newusermsg,0,rindex($newusermsg,'<li>') );
  $newusermsg = "<br/><br/>The following new system user(s) who was/were created will be using internal authentication with an initial randomly generated password. A valid e-mail address was not available for this/these user(s) so LON-CAPA account credentials could not be sent via e-mail.<br/><ul><li>".$newusermsg."</ul><br/>";   $newusermsg = "<br/><br/>The following new system user(s) who was/were created will be using local or internal authentication with an initial randomly generated password. A valid e-mail address was not available for this/these user(s) so LON-CAPA account credentials could not be sent via e-mail.<br/><ul><li>".$newusermsg."</ul><br/>";
     }      }
     $response .= $logmsg.$newusermsg;      $response .= $logmsg.$newusermsg;
     &print_reply($r,$response,$$tasktitleref{$action});      &print_reply($r,$response,$$tasktitleref{$action});
Line 2087  sub print_viewclass_response { Line 2230  sub print_viewclass_response {
     my $chgok = 0;      my $chgok = 0;
     my $chgfail = 0;      my $chgfail = 0;
     my $othdom = 0;      my $othdom = 0;
       my $locktotal = 0;
       my $lockok = 0;
       my $lockfail = 0;
     my $cid = $dom."_".$crs;      my $cid = $dom."_".$crs;
     my %chg = ();      my %chg = ();
     my %nochg = ();      my %nochg = ();
     my %otherdom = ();      my %otherdom = ();
     my $modreply = '';       my %lockchg = ();
       my %nolockchg = ();
     my $classlist = &Apache::loncoursedata::get_classlist($cid,$dom,$crs);      my $classlist = &Apache::loncoursedata::get_classlist($cid,$dom,$crs);
     my $endidx = &Apache::loncoursedata::CL_END;      my $endidx = &Apache::loncoursedata::CL_END;
     my $startidx = &Apache::loncoursedata::CL_START;      my $startidx = &Apache::loncoursedata::CL_START;
     my $ididx=&Apache::loncoursedata::CL_ID;      my $ididx=&Apache::loncoursedata::CL_ID;
     my $secidx=&Apache::loncoursedata::CL_SECTION;      my $secidx=&Apache::loncoursedata::CL_SECTION;
     my $typeidx=&Apache::loncoursedata::CL_TYPE;      my $typeidx=&Apache::loncoursedata::CL_TYPE;
     foreach (sort keys %ENV) {      my $lockedidx=&Apache::loncoursedata::CL_LOCKEDTYPE;
         if (/^form\.switch:(.+)$/) {      my @typechglist = ();
             my $student = $1;      my @lockchglist = ();
             my ($uname,$udom) = split/:/,$student;      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['chgauto','chgmanual','lockchg','unlockchg']);
             my $sdata    = $classlist->{$student};      if ($ENV{'form.chgauto'}) {
             my $section  = $sdata->[$secidx];          if (ref($ENV{'form.chgauto'}) eq 'ARRAY') {
             my $uid       = $sdata->[$ididx];              push @typechglist, @{$ENV{'form.chgauto'}};
             my $start    = $sdata->[$startidx];          } else {
             my $end      = $sdata->[$endidx];              push @typechglist, $ENV{'form.chgauto'};
             my $type     = $sdata->[$typeidx];          }
             $chgtotal ++;      }
             my $newtype = 'auto';      if ($ENV{'form.chgmanual'}) {
             my $change = 'auto';          if (ref($ENV{'form.chgmanual'}) eq 'ARRAY') {
             my $oldtype = 'manual';              push @typechglist, @{$ENV{'form.chgmanual'}};
             if ($type eq 'auto') {           } else {
                 $oldtype = 'auto';              push @typechglist, $ENV{'form.chgmanual'};
                 $newtype = '';          }
                 $change = 'manual';      }
       if ($ENV{'form.lockchg'}) {
           if (ref($ENV{'form.lockchg'}) eq 'ARRAY') {
               push @lockchglist, @{$ENV{'form.lockchg'}};
           } else {
               push @lockchglist, $ENV{'form.lockchg'};
           }
       }
       if ($ENV{'form.unlockchg'}) {
           if (ref($ENV{'form.unlockchg'}) eq 'ARRAY') {
               push @lockchglist, @{$ENV{'form.unlockchg'}};
           } else {
               push @lockchglist, $ENV{'form.unlockchg'};
           }
       }
       foreach my $student (sort @typechglist) {
           my ($uname,$udom) = split/:/,$student;
           my $sdata    = $classlist->{$student};
           my $section  = $sdata->[$secidx];
           my $uid       = $sdata->[$ididx];
           my $start    = $sdata->[$startidx];
           my $end      = $sdata->[$endidx];
           my $type     = $sdata->[$typeidx];
           my $lock   = $sdata->[$lockedidx];
           my $newlock = $lock;
           $chgtotal ++;
           my $newtype = 'auto';
           my $change = 'auto';
           my $oldtype = 'manual';
           if ($type eq 'auto') { 
               $oldtype = 'auto';
               $newtype = '';
               $change = 'manual';
           }
           if ($udom eq $dom) {
               if ($newtype eq 'auto') {
                   $newlock = '';
               } elsif ($newtype eq '') {
                   $newlock = '1';
             }              }
             if ($udom eq $dom) {              my $modreply = &Apache::lonnet::modify_student_enrollment($udom,$uname,$uid,'','','','',$section,$end,$start,$newtype,$newlock,$cid);
                 $modreply = &Apache::lonnet::modify_student_enrollment($udom,$uname,$uid,'','','','',$section,$end,$start,$newtype,$cid);              if ($modreply eq 'ok') {
                 if ($modreply eq 'ok') {                  $chgok ++;
                     $chgok ++;                  $chg{$student} = "Changed to $change";
                     $chg{$student} = "Changed to $change";  
                 } else {  
                     $chgfail ++;  
                     $nochg{$student} = "Still set to $oldtype";  
                 }   
             } else {              } else {
                 $othdom ++;                  $chgfail ++;
                 $otherdom{$student} = "Still set to $oldtype";                   $nochg{$student} = "Still set to $oldtype";
               } 
           } else {
               $othdom ++;
               $otherdom{$student} = "Still set to $oldtype"; 
           }
       }
       foreach my $student (@lockchglist) {
           my ($uname,$udom) = split/:/,$student;
           my $sdata    = $classlist->{$student};
           my $section  = $sdata->[$secidx];
           my $uid       = $sdata->[$ididx];
           my $start    = $sdata->[$startidx];
           my $end      = $sdata->[$endidx];
           my $type     = $sdata->[$typeidx];
           my $lock   = $sdata->[$lockedidx];
           my $newlock = 1;
           my $oldlockname = &mt('unlocked');
           my $newlockname = &mt('locked');
           $locktotal++;
           unless ($type eq 'auto') {
               if ($lock) {
                   $newlock = '';
                   $newlockname = &mt('unlocked');
                   $oldlockname = &mt('locked'); 
               }
               my $lockreply = &Apache::lonnet::modify_student_enrollment($udom,$uname,$uid,'','','','',$section,$end,$start,$type,$newlock,$cid);
               if ($lockreply eq 'ok') {
                   $lockok ++;
                   $lockchg{$student} = 'Changed to '.$newlockname;
               } else {
                   $lockfail ++;
                   $nolockchg{$student} = 'Still set to '.$oldlockname;
             }              }
         }          }
     }      }
Line 2147  sub print_viewclass_response { Line 2359  sub print_viewclass_response {
             $response .= "The following $othdom students were not modified because students must be in the same LON-CAPA domain as the course, in order to be set to an enrollment type of 'auto':<br />";               $response .= "The following $othdom students were not modified because students must be in the same LON-CAPA domain as the course, in order to be set to an enrollment type of 'auto':<br />"; 
             $response .= &enrolltype_result(\%otherdom,$classlist,$endidx,$startidx,$ididx,$secidx,$typeidx);              $response .= &enrolltype_result(\%otherdom,$classlist,$endidx,$startidx,$ididx,$secidx,$typeidx);
         }          }
           $response .= "<br /><br />";
       }
       if ($locktotal > 0) {
           $response .= "You requested locking/unlocking for $locktotal manually enrolled students.<br /><br />\n";
           $classlist = &Apache::loncoursedata::get_classlist($cid,$dom,$crs);
           if ($lockok > 0) {
               $response .= "The following $lockok changes were successful:<br />";
               $response .= &enrolltype_result(\%lockchg,$classlist,$endidx,$startidx,$ididx,$secidx,$typeidx,$lockedidx);
           }
           if ($lockfail > 0) {
               $response .= "The following $lockfail students were not modified successfully:&nbsp;<br />";
               $response .= &enrolltype_result(\%nolockchg,$classlist,$endidx,$startidx,$ididx,$secidx,$typeidx,$lockedidx);
           }
     }      }
     &print_reply($r,$response,$$tasktitleref{$action});      &print_reply($r,$response,$$tasktitleref{$action});
     return;      return;
 }  }
   
 sub enrolltype_result {  sub enrolltype_result {
     my ($changes,$classlist,$endidx,$startidx,$ididx,$secidx,$typeidx) = @_;      my ($changes,$classlist,$endidx,$startidx,$ididx,$secidx,$typeidx,$lockedidx) = @_;
     my $reply = "      my $reply = "
             <table border='2'>              <table border='2'>
              <tr>               <tr>
Line 2362  sub handler { Line 2587  sub handler {
                updatenow => "Update roster now",                 updatenow => "Update roster now",
                newcross => "Add crosslistings",                 newcross => "Add crosslistings",
                newsections => "Add sections",                 newsections => "Add sections",
                viewclass => "View students and type",                 viewclass => "View students and change type",
     );      );
                                                                                                                                                                     
     my %tasktitle = (      my %tasktitle = (
Line 2405  sub handler { Line 2630  sub handler {
         $r->print(&header());           $r->print(&header()); 
     } else {      } else {
         if ($state eq "choose") {          if ($state eq "choose") {
             $r->print(&choose_header());              $r->print(&choose_header($action));
         } else {          } else {
             if ($action eq "crosslist") {              if ($action eq "crosslist") {
                 if ( exists($ENV{'form.numcross'}) ) {                  if ( exists($ENV{'form.numcross'}) ) {
                     if ( $ENV{'form.numcross'} > 0 ) {                      if ( $ENV{'form.numcross'} > 0 ) {
                         $r->print(&choose_header());                          $r->print(&choose_header($action));
                     } else {                      } else {
                         $r->print(&header());                          $r->print(&header());
                     }                      }
Line 2420  sub handler { Line 2645  sub handler {
             } elsif ($action eq "sections") {              } elsif ($action eq "sections") {
                 if ( exists($ENV{'form.numsec'}) ) {                  if ( exists($ENV{'form.numsec'}) ) {
                     if ( $ENV{'form.numsec'} > 0 ) {                      if ( $ENV{'form.numsec'} > 0 ) {
                         $r->print(&choose_header());                          $r->print(&choose_header($action));
                     } else {                      } else {
                         $r->print(&header());                          $r->print(&header());
                     }                      }

Removed from v.1.15  
changed lines
  Added in v.1.20


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