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

Diff for /loncom/interface/lonpopulate.pm between versions 1.51 and 1.62.4.1

version 1.51, 2007/12/14 00:20:53 version 1.62.4.1, 2009/09/10 11:39:05
Line 49  sub choose_header { Line 49  sub choose_header {
     my ($action) = @_;      my ($action) = @_;
     my $notify_check = '/^note_[0-9]+$/';      my $notify_check = '/^note_[0-9]+$/';
     my $scripttag = qq|      my $scripttag = qq|
 <script language='javascript' type='text/javascript'>  <script type=\"text/javascript\" language=\"JavaScript\">
 <!--  <!--
 function process(calling,numauto,nummanual,numlock,numunlock) {  function process(calling,numauto,nummanual,numlock,numunlock) {
  var checker = 1   var checker = 1
Line 208  sub print_mainbox { Line 208  sub print_mainbox {
     }      }
     my $page = '';      my $page = '';
     if ($action eq "information") {      if ($action eq "information") {
         $page = "<b>Automated Enrollment</b>";          $page = "<b>".&mt("Automated Enrollment")."</b>";
     } else {      } else {
         $page =  '<a href="/adm/populate">Automated Enrollment</a>';          $page =  '<a href="/adm/populate">'.&mt('Automated Enrollment').'</a>';
         if ($reply) {          if ($reply) {
             if ($action eq "newcross") {              if ($action eq "newcross") {
                 $action = "crosslist";                  $action = "crosslist";
Line 222  sub print_mainbox { Line 222  sub print_mainbox {
             $page .=  " -&gt; <b>".$$tasklongref{$action}."</b>";               $page .=  " -&gt; <b>".$$tasklongref{$action}."</b>"; 
         }          }
     }      }
       my $usrmang = &mt('User Management');
       my $autenrl = &mt('Automated Enrollment Manager');
     $r->print(<<ENDTHIS);      $r->print(<<ENDTHIS);
 <table width="100%" border="0" cellpadding="0" cellspacing="0">  <table width="100%" border="0" cellpadding="0" cellspacing="0">
  <tr>   <tr>
   <td bgcolor="#CCCCFF">     <td bgcolor="#CCCCFF"> 
    <font size="2"><a href="/adm/menu">$realm</a> -&gt; <a href="/adm/createuser">User Management</a> -&gt; $page</font><br/>     <font size="2"><a href="/adm/menu">$realm</a> -&gt; <a href="/adm/createuser">$usrmang</a> -&gt; $page</font><br/>
   </td>    </td>
   <td align="right" bgcolor="#CCCCFF" valign="top">    <td align="right" bgcolor="#CCCCFF" valign="top">
    <font size="+1">Automated Enrollment Manager&nbsp;</font>     <font size="+1">$autenrl&nbsp;</font>
   </td>    </td>
  </tr>   </tr>
 </table>  </table>
Line 368  ENDONE Line 370  ENDONE
 ENDTWO  ENDTWO
       if ($enrollvar{autoadds}) {        if ($enrollvar{autoadds}) {
           $r->print("            $r->print("
     <label><input type=\"radio\" name=\"autoadds\" value=\"1\" checked=\"true\" />&nbsp;Enable&nbsp;&nbsp;&nbsp;</label>      <label><input type=\"radio\" name=\"autoadds\" value=\"1\" checked=\"checked\" />&nbsp;Enable&nbsp;&nbsp;&nbsp;</label>
     <label><input type=\"radio\" name=\"autoadds\" value=\"0\" />&nbsp;Disable</label>      <label><input type=\"radio\" name=\"autoadds\" value=\"0\" />&nbsp;Disable</label>
          ");           ");
       } else {        } else {
           $r->print("            $r->print("
                             <label><input type=\"radio\" name=\"autoadds\" value=\"1\" />&nbsp;Enable&nbsp;&nbsp;&nbsp;</label>                              <label><input type=\"radio\" name=\"autoadds\" value=\"1\" />&nbsp;Enable&nbsp;&nbsp;&nbsp;</label>
                             <label><input type=\"radio\" name=\"autoadds\" value=\"0\" checked=\"true\" />&nbsp;Disable</label>                              <label><input type=\"radio\" name=\"autoadds\" value=\"0\" checked=\"checked\" />&nbsp;Disable</label>
          ");           ");
       }        }
       $r->print("        $r->print("
Line 385  ENDTWO Line 387  ENDTWO
         Removals based on classlist changes:&nbsp;&nbsp;");          Removals based on classlist changes:&nbsp;&nbsp;");
       if ($enrollvar{autodrops}) {        if ($enrollvar{autodrops}) {
           $r->print("            $r->print("
                 <label><input type=\"radio\" name=\"autodrops\" value=\"1\" checked=\"true\" />&nbsp;Enable&nbsp;&nbsp;&nbsp;</label>                  <label><input type=\"radio\" name=\"autodrops\" value=\"1\" checked=\"checked\" />&nbsp;Enable&nbsp;&nbsp;&nbsp;</label>
                 <label><input type=\"radio\" name=\"autodrops\" value=\"0\" />&nbsp;Disable</label>");                  <label><input type=\"radio\" name=\"autodrops\" value=\"0\" />&nbsp;Disable</label>");
       } else {        } else {
           $r->print("            $r->print("
                 <label><input type=\"radio\" name=\"autodrops\" value=\"1\" />&nbsp;Enable&nbsp;&nbsp;&nbsp;</label>                  <label><input type=\"radio\" name=\"autodrops\" value=\"1\" />&nbsp;Enable&nbsp;&nbsp;&nbsp;</label>
                 <label><input type=\"radio\" name=\"autodrops\" value=\"0\" checked=\"true\" />&nbsp;Disable</label>");                  <label><input type=\"radio\" name=\"autodrops\" value=\"0\" checked=\"checked\" />&nbsp;Disable</label>");
       }        }
       $r->print("        $r->print("
               </td>                </td>
Line 398  ENDTWO Line 400  ENDTWO
              <tr>               <tr>
               <td>                <td>
                <font color=\"#888888\">                 <font color=\"#888888\">
 Note: Any students added manually by course coordinators using the Enrollment Manager will be unaffected by the nightly removal process if you choose to enable it.  Note: Any students added manually by course coordinators using the User Manager will be unaffected by the nightly removal process if you choose to enable it.
                </font>                 </font>
               </td>                </td>
              </tr>               </tr>
Line 506  ENDTWO Line 508  ENDTWO
   } elsif ($action eq "notify") {    } elsif ($action eq "notify") {
       my $notifycount = 0;        my $notifycount = 0;
       my @notified = split(/,/,$enrollvar{notifylist});        my @notified = split(/,/,$enrollvar{notifylist});
       my @domcoord;        my (@domcoord,@showdom,@olddomcoord,@futuredomcoord);
       my @showdom;  
       for (my $i=0; $i<@notified; $i++) {        for (my $i=0; $i<@notified; $i++) {
           if ($notified[$i] !~ /:/) {            if ($notified[$i] !~ /:/) {
               $notified[$i] =~ s/\@/:/;                $notified[$i] =~ s/\@/:/;
Line 520  ENDTWO Line 521  ENDTWO
       } else {        } else {
           $noteset = "OFF";            $noteset = "OFF";
       }        }
         my $now = time;
       my %dompersonnel = &Apache::lonnet::get_domain_roles($dom,['dc']);        my %dompersonnel = &Apache::lonnet::get_domain_roles($dom,['dc']);
       foreach my $server (keys(%dompersonnel)) {        foreach my $server (keys(%dompersonnel)) {
           foreach my $user (sort(keys(%{$dompersonnel{$server}}))) {            foreach my $user (sort(keys(%{$dompersonnel{$server}}))) {
               my ($trole,$uname,$udom,$runame,$rudom,$rsec) = split(/:/,$user);                my ($trole,$uname,$udom,$runame,$rudom,$rsec) = split(/:/,$user);
               if (!grep(/^$uname:$udom$/,@domcoord)) {                my ($end,$start) = split(':',$dompersonnel{$server}{$user});
                   push(@domcoord,$uname.':'.$udom);                if (($end eq '') || ($end == 0) || ($end > $now)) {
                     if ($start > $now) {
                         if (!grep(/^\Q$uname\E:\Q$udom\E$/,@futuredomcoord)) {
                             push(@futuredomcoord,$uname.':'.$udom);
                         }
                     } else {
                         if (!grep(/^\Q$uname\E:\Q$udom\E$/,@domcoord)) {
                             push(@domcoord,$uname.':'.$udom);
                         }
                     }
                 } else {
                     if (!grep(/^\Q$uname\E:\Q$udom\E$/,@olddomcoord)) {
                         push(@olddomcoord,$uname.':'.$udom);
                     }
               }                }
           }            }
       }        }
Line 545  ENDTWO Line 560  ENDTWO
       ");        ");
       if ($notifycount) {        if ($notifycount) {
           $r->print("            $r->print("
                         <label><input type=\"radio\" name=\"notify\" value=\"1\" checked=\"true\" />&nbsp;Yes&nbsp;&nbsp;&nbsp;</label>                          <label><input type=\"radio\" name=\"notify\" value=\"1\" checked=\"checked\" />&nbsp;Yes&nbsp;&nbsp;&nbsp;</label>
                         <label><input type=\"radio\" name=\"notify\" value=\"0\" />&nbsp;No</label>                          <label><input type=\"radio\" name=\"notify\" value=\"0\" />&nbsp;No</label>
           ");            ");
       } else {        } else {
           $r->print("            $r->print("
                         <label><input type=\"radio\" name=\"notify\" value=\"1\" />&nbsp;Yes&nbsp;&nbsp;&nbsp;</label>                          <label><input type=\"radio\" name=\"notify\" value=\"1\" />&nbsp;Yes&nbsp;&nbsp;&nbsp;</label>
                         <label><input type=\"radio\" name=\"notify\" value=\"0\" checked=\"true\" />&nbsp;No</label>                          <label><input type=\"radio\" name=\"notify\" value=\"0\" checked=\"checked\" />&nbsp;No</label>
           ");            ");
       }        }
       $r->print("        $r->print("
Line 563  ENDTWO Line 578  ENDTWO
       my %pname;        my %pname;
       my %notifystate;        my %notifystate;
       my %status;        my %status;
       my $now = time;  
       foreach my $person (sort(keys(%coursepersonnel))) {        foreach my $person (sort(keys(%coursepersonnel))) {
           my $match = 0;            my $match = 0;
           my ($role,$user,$usec) = ($person =~ /^([^:]+):([^:]+:[^:]+):([^:]*)/);            my ($role,$user,$usec) = ($person =~ /^([^:]+):([^:]+:[^:]+):([^:]*)/);
Line 599  ENDTWO Line 613  ENDTWO
                                   usnm => 'username:domain',                                    usnm => 'username:domain',
                                   coac => 'Course Access',                                    coac => 'Course Access',
                                   curn => 'Current notification status',                                    curn => 'Current notification status',
                                     doms => 'Domain Coordinator status',
                                   notf => 'Notification?',                                    notf => 'Notification?',
                                   ntac => 'Notification active',                                    ntac => 'Notification active',
                                   ntin => 'Notification inactive',                                    ntin => 'Notification inactive',
Line 628  ENDTWO Line 643  ENDTWO
       if (grep(/^$viewer$/,@domcoord)) {        if (grep(/^$viewer$/,@domcoord)) {
           $showalldc = 1;            $showalldc = 1;
       }        }
       foreach my $dc (@domcoord) {        foreach my $dc (@domcoord,@futuredomcoord) {
           if (!grep(/^$dc$/,@ccs)) {            if (!grep(/^$dc$/,@ccs)) {
               if (grep(/^$dc$/,@notified)) {                if (grep(/^$dc$/,@notified)) {
                   $notifystate{$dc} = 1;                    $notifystate{$dc} = 1;
Line 643  ENDTWO Line 658  ENDTWO
               push(@showdom,$dc);                push(@showdom,$dc);
           }            }
       }        }
         foreach my $olddc (@olddomcoord) {
             if (grep(/^$olddc$/,@notified)) {
                 if (!grep(/^\Q$olddc\E$/,@ccs)) {
                     $notifystate{$olddc} = 1;
                     my ($dcname,$dcdom) = split(/:/,$olddc);
                     $pname{$olddc} =  &Apache::loncommon::plainname($dcname,$dcdom);
                     push(@showdom,$olddc);
                 }
             }
         }
       my $showdomnum = scalar(@showdom);        my $showdomnum = scalar(@showdom);
       if ($showdomnum) {        if ($showdomnum) {
           $r->print("            $r->print("
Line 660  ENDTWO Line 685  ENDTWO
              </tr>               </tr>
              <tr>               <tr>
               <td>");                <td>");
           $r->print(&notifier_tables('dc',\%lt,\@showdom,\%status,\%notifystate,            $r->print(&notifier_tables('dc',\%lt,\@showdom,\%status,\%notifystate,\%pname,
                                      \%pname,\$notifyshow));                                       \$notifyshow,\@olddomcoord,\@futuredomcoord));
           $r->print("            $r->print("
              </td>               </td>
           </tr>");            </tr>");
Line 732  ENDTWO Line 757  ENDTWO
               my $colflag = $i%2;                my $colflag = $i%2;
               $r->print(&Apache::loncommon::start_data_table_row());                $r->print(&Apache::loncommon::start_data_table_row());
               $r->print("                $r->print("
                  <td><input type=\"checkbox\" name=\"cross_$i\" checked=\"true\" /></td>                   <td><input type=\"checkbox\" name=\"cross_$i\" checked=\"checked\" /></td>
                  <td>$xl</td>                   <td>$xl</td>
                  <td><input type =\"text\" size=\"10\" name=\"lcsec_$i\" value=\"$lc_sec\" /></td>                   <td><input type=\"text\" size=\"10\" name=\"lcsec_$i\" value=\"$lc_sec\" /></td>
               ");                ");
               $r->print(&Apache::loncommon::end_data_table_row());                $r->print(&Apache::loncommon::end_data_table_row());
           }            }
Line 823  ENDTWO Line 848  ENDTWO
                   $r->print("Enrollment inactive");                    $r->print("Enrollment inactive");
               }                }
               if ($shrflag) {                if ($shrflag) {
                   $r->print("</td><td><input type=\"text\" size=\"10\" name=\"loncapasec_$i\" value=\"$sec_id{$sections[$i]}\"></td><td><input type=\"checkbox\" name=\"sec_$i\" checked=\"true\" /></td>");                     $r->print("</td><td><input type=\"text\" size=\"10\" name=\"loncapasec_$i\" value=\"$sec_id{$sections[$i]}\" /></td><td><input type=\"checkbox\" name=\"sec_$i\" checked=\"checked\" /></td>"); 
               } else {                } else {
                   $r->print("</td><td><input type=\"text\" size=\"10\" name=\"loncapasec_$i\" value=\"\" /></td><td><input type=\"checkbox\" name=\"sec_$i\" /></td>");                    $r->print("</td><td><input type=\"text\" size=\"10\" name=\"loncapasec_$i\" value=\"\" /></td><td><input type=\"checkbox\" name=\"sec_$i\" /></td>");
               }                }
Line 872  ENDTWO Line 897  ENDTWO
                   my $colflag = $j%2;                    my $colflag = $j%2;
                   $r->print(&Apache::loncommon::start_data_table_row());                    $r->print(&Apache::loncommon::start_data_table_row());
                   $r->print("                    $r->print("
                  <td><input type=\"checkbox\" name=\"sec_$j\" checked=\"true\" /></td>                   <td><input type=\"checkbox\" name=\"sec_$j\" checked=\"checked\" /></td>
                  <td>$currsections[$j]</td>                   <td>$currsections[$j]</td>
                  <td><input type=\"text\" name=\"lcsec_$j\" size=\"10\" value=\"$sec_id{$currsections[$j]}\" /></td>                   <td><input type=\"text\" name=\"lcsec_$j\" size=\"10\" value=\"$sec_id{$currsections[$j]}\" /></td>
                   ");                    ");
Line 929  ENDTWO Line 954  ENDTWO
       ");        ");
       if ($enrollvar{showphoto}) {        if ($enrollvar{showphoto}) {
           $r->print("            $r->print("
                         <label><input type=\"radio\" name=\"showphotos\" value=\"1\" checked=\"true\" />&nbsp;Yes&nbsp;&nbsp;&nbsp;</label>                          <label><input type=\"radio\" name=\"showphotos\" value=\"1\" checked=\"checked\" />&nbsp;Yes&nbsp;&nbsp;&nbsp;</label>
                         <label><input type=\"radio\" name=\"showphotos\" value=\"0\" />&nbsp;No</label>                          <label><input type=\"radio\" name=\"showphotos\" value=\"0\" />&nbsp;No</label>
           ");            ");
       } else {        } else {
           $r->print("            $r->print("
                         <label><input type=\"radio\" name=\"showphotos\" value=\"1\" />&nbsp;Yes&nbsp;&nbsp;&nbsp;</label>                          <label><input type=\"radio\" name=\"showphotos\" value=\"1\" />&nbsp;Yes&nbsp;&nbsp;&nbsp;</label>
                         <label><input type=\"radio\" name=\"showphotos\" value=\"0\" checked=\"true\" />&nbsp;No</label>                          <label><input type=\"radio\" name=\"showphotos\" value=\"0\" checked=\"checked\" />&nbsp;No</label>
           ");            ");
       }        }
       $r->print('        $r->print('
Line 954  ENDTWO Line 979  ENDTWO
                       $r->print('                        $r->print('
                     <tr>                      <tr>
                      <td>'.                       <td>'.
 &mt('Previously the owner of this course agreed to the conditions of use of digital student photos required by [_1].', $institution).'<br />'.&mt('As a result [_1]s can choose to automatically import student photos into this course.',&Apache::lonnet::plaintext('cc')).'<br /><nobr><label>'.&mt('[_1] owner acceptance of these conditions of use?','<b>Cancel</b>').'&nbsp;<input type="checkbox" name="cancel_agreement" value="1" /></label></nobr>  &mt('Previously the owner of this course agreed to the conditions of use of digital student photos required by [_1].', $institution).'<br />'.&mt('As a result [_1]s can choose to automatically import student photos into this course.',&Apache::lonnet::plaintext('cc')).'<br /><span class="LC_nobreak"><label>'.&mt('[_1] owner acceptance of these conditions of use?','<b>Cancel</b>').'&nbsp;<input type="checkbox" name="cancel_agreement" value="1" /></label></span>
                      </td>                       </td>
                     </tr>                      </tr>
                       ');                        ');
Line 1000  ENDTWO Line 1025  ENDTWO
               }                }
               $r->print('                $r->print('
                     <tr>                      <tr>
                      <td>'.                       <td>'
 &mt('The policies of your institution ([_1]) require that the course owner ([_2]) must indicate acceptance of the conditions of use of digital photos of registered students, before they may be made available for use in a course.',$institution,$ownername).'<br /><br />'.&mt('Please direct the course owner [_1] to visit the "Student photos" page in the Automated Enrollment Manager to indicate acceptance of these conditions of use.',$emailstr).'<br /><br /><input type="button" name="mainmenu" value="Go back" onclick="javascript:history.go(-1);" />                        .&mt('The policies of your institution ([_1]) require that the course owner ([_2]) must indicate acceptance of the conditions of use of digital photos of registered students, before they may be made available for use in a course.',$institution,$ownername)
                         .'<br /><br />'
                         .&mt('Please direct the course owner [_1] to visit the "Student photos" page in the Automated Enrollment Manager to indicate acceptance of these conditions of use.',$emailstr)
                         .'<br /><br /><input type="button" name="mainmenu" value="Go back" onclick="javascript:history.go(-1);" />
                     </td>                      </td>
                    </tr>                     </tr>
                   </form>                    </form>
Line 1083  Note: Any students previously added manu Line 1111  Note: Any students previously added manu
           if ($update) {             if ($update) { 
               $r->print('<br />'.$commentary.'<br /><br />                $r->print('<br />'.$commentary.'<br /><br />
 <form name="photoupdate" method="post">  <form name="photoupdate" method="post">
 <input type ="button" name="retrieve" value="'.&mt('Update photo repository').'"  <input type="button" name="retrieve" value="'.&mt('Update photo repository').'"
 onclick="javascript:document.photoupdate.submit()" />  onclick="javascript:document.photoupdate.submit()" />
 <input type ="hidden" name="action" value="'.$action.'" />  <input type="hidden" name="action" value="'.$action.'" />
 <input type ="hidden" name="state" value="process" />  <input type="hidden" name="state" value="process" />
 </form>');  </form>');
           } else {            } else {
               $r->print(&mt('Update of photos via the Automated Enrollment Manager is unavailable in this domain.').'<br /><br /><input type="button" name=mainmenu" value="Go back" onclick="javascript:history.go(-1);" />');                $r->print(&mt('Update of photos via the Automated Enrollment Manager is unavailable in this domain.')
                          .'<br /><br /><input type="button" name="mainmenu" value="'.&mt('Go back').'" onclick="javascript:history.go(-1);" />');
           }            }
       } else {        } else {
           $r->print('Update of photos is unavailable, as import of student photos is currently disabled.<br />Enable this first via: <a href="/adm/populate?action=photos">'.$$tasktitleref{'photos'}.'</a>');            $r->print('Update of photos is unavailable, as import of student photos is currently disabled.<br />Enable this first via: <a href="/adm/populate?action=photos">'.$$tasktitleref{'photos'}.'</a>');
Line 1224  END Line 1253  END
 }  }
   
 sub notifier_tables {  sub notifier_tables {
     my ($role,$lt,$users,$status,$notifystate,$pname,$notifyshow) = @_;      my ($role,$lt,$users,$status,$notifystate,$pname,$notifyshow,$olddomcoord,
           $futuredomcoord) = @_;
     my $output = &Apache::loncommon::start_data_table();      my $output = &Apache::loncommon::start_data_table();
     $output .= &Apache::loncommon::start_data_table_header_row();      $output .= &Apache::loncommon::start_data_table_header_row();
     $output .= "<th>$$lt{name}</th>      $output .= "<th>$$lt{name}</th>
                 <th>$$lt{usnm}</th>";                  <th>$$lt{usnm}</th>";
     if ($role eq 'cc') {      if ($role eq 'dc') {
           $output .= "<th>$$lt{doms}</th>";
       } elsif ($role eq 'cc') {
         $output .= "<th>$$lt{coac}</th>";          $output .= "<th>$$lt{coac}</th>";
     }       }
     $output .=  "<th>$$lt{curn}</th>      $output .=  "<th>$$lt{curn}</th>
                  <th>$$lt{notf}</th>";                   <th>$$lt{notf}</th>";
     $output .= &Apache::loncommon::end_data_table_header_row();      $output .= &Apache::loncommon::end_data_table_header_row();
Line 1240  sub notifier_tables { Line 1272  sub notifier_tables {
         $output .= '<td>'.$$pname{$$users[$i]}.'</td>'.          $output .= '<td>'.$$pname{$$users[$i]}.'</td>'.
                    '<td><input type="hidden" name="notifyname_'.$$notifyshow.                     '<td><input type="hidden" name="notifyname_'.$$notifyshow.
                    '" value="'.$$users[$i].'" />'.$$users[$i].'</td>';                     '" value="'.$$users[$i].'" />'.$$users[$i].'</td>';
         if ($role eq 'cc') {          if ($role eq 'dc') {
               $output .= '<td>';
               if ((ref($olddomcoord) eq 'ARRAY') && (ref($futuredomcoord) eq 'ARRAY')) {
                   if (grep(/^\Q$users->[$i]\E$/,@{$olddomcoord})) {
                       $output .= &mt('expired');
                   } elsif (grep(/^\Q$users->[$i]\E$/,@{$futuredomcoord})) {
                       $output .= &mt('future');
                   } else {
                       $output .= &mt('active');
                   }
               }
               $output .= '</td>';
           } elsif ($role eq 'cc') {
             $output .= '<td>'.$$status{$$users[$i]}.'</td>';              $output .= '<td>'.$$status{$$users[$i]}.'</td>';
         }          }
         $output .= '<td>';          $output .= '<td>';
Line 1284  sub print_accessdate_table { Line 1328  sub print_accessdate_table {
          '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.'           'ncds'  => 'changing default start and end access dates will affect <b>future enrollments</b> and also <b>currently inactive</b> students (i.e., those for whom access will begin in the future).',
            'tcha' => 'To change access dates for <b>currently active</b> students, use User Management -> "Display Class Lists and Manage Multiple Users" to display currently active students, then use the dropdown menu for "Action to take for selected users:" to choose "Change starting/ending dates", select the students to change, and click "Proceed".',
     );      );
     my $dateshow;      my $dateshow;
     if ( ($oldendshow eq '') && ($oldstartshow eq '') ) {      if ( ($oldendshow eq '') && ($oldstartshow eq '') ) {
Line 1368  ENDFOUR Line 1412  ENDFOUR
                     <td colspan=\"2\">&nbsp;</td>                      <td colspan=\"2\">&nbsp;</td>
                    </tr>                     </tr>
                    <tr>                     <tr>
                     <td colspan=\"2\"><b>".&mt('Note').":</b> ".$lt{'ncds'}."</td>                      <td colspan=\"2\"><b>".&mt('Note').":</b> ".$lt{'ncds'}.' '.$lt{'tcha'}."</td>
                    </tr>                     </tr>
                   </table>                    </table>
         ");          ");
Line 1608  start and end access dates for this cour Line 1652  start and end access dates for this cour
     $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 being 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 being 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 being 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 being added via automated enrollment has been changed to $showend.<br/>";
 $showend.<br/>";  
     }      }
               $response .= '<br />'.&mt('Any change in access dates will only apply to students who are not currently active, i.e., those who currently have access start dates in the future, and to those added by future automated enrollment.').'<br /><br />'.&mt('To change access dates for any currently active students, use User Management -> "Display Class Lists and Manage Multiple Users" to display currently active students, then use the dropdown menu for "Action to take for selected users:" to choose "Change starting/ending dates", select the students to change, and click "Proceed".').'<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.
   
Line 2375  sub print_photo_agreement { Line 2418  sub print_photo_agreement {
     my $institution = &Apache::lonnet::domain($dom,'description');      my $institution = &Apache::lonnet::domain($dom,'description');
     if (&user_is_courseowner($courseowner)) {      if (&user_is_courseowner($courseowner)) {
         $response = '          $response = '
 <script type="text/javascript">  <script type="text/javascript" language="JavaScript">
 function agreement_result(caller) {  function agreement_result(caller) {
     document.permission.photopermission.value = caller;      document.permission.photopermission.value = caller;
     if (caller == 0) {      if (caller == 0) {
Line 2408  function agreement_result(caller) { Line 2451  function agreement_result(caller) {
       </td>        </td>
     </tr>      </tr>
    </table>     </table>
    <input type ="hidden" name="action" value="'.$action.'" />     <input type="hidden" name="action" value="'.$action.'" />
    <input type ="hidden" name="state" value="process" />     <input type="hidden" name="state" value="process" />
    <input type ="hidden" name="showphotos" value="1" />     <input type="hidden" name="showphotos" value="1" />
    <input type= "hidden" name="photopermission" value="" />     <input type="hidden" name="photopermission" value="" />
   </form>    </form>
 ';  ';
     } else {      } else {
Line 2420  function agreement_result(caller) { Line 2463  function agreement_result(caller) {
         if ($owneremail) {          if ($owneremail) {
             $emailstr = "(e-mail: $owneremail)";              $emailstr = "(e-mail: $owneremail)";
         }          }
         $response = &mt('The policies of your institution [_1] require that the course owner [_2] must indicate acceptance of the conditions of use of digital photos of registered students, before they may be made available for use in a course.',$institution,$ownername).'<br /><br />'.&mt('Please direct the course owner [_1] to visit the "Student photos" page in the Automated Enrollment Manager to indicate acceptance of these conditions of use',$emailstr);          $response = &mt('The policies of your institution [_1] require that the course owner [_2] must indicate acceptance of the conditions of use of digital photos of registered students, before they may be made available for use in a course.',$institution,$ownername)
                      .'<br /><br />'
                      .&mt('Please direct the course owner [_1] to visit the "Student photos" page in the Automated Enrollment Manager to indicate acceptance of these conditions of use.',$emailstr);
     }      }
     &print_reply($r,$response,$$tasktitleref{$action});      &print_reply($r,$response,$$tasktitleref{$action});
 }  }
Line 2464  sub print_photos_response { Line 2509  sub print_photos_response {
                 if ($update) {                  if ($update) {
                     $response .= '<br />'.$commentary.'<br /><br />                      $response .= '<br />'.$commentary.'<br /><br />
 <form name="photoupdate" method="post">  <form name="photoupdate" method="post">
 <input type ="button" name="retrieve" value="'.&mt('Update photo repository').'"   <input type="button" name="retrieve" value="'.&mt('Update photo repository').'" 
 onclick="javascript:document.photoupdate.submit()" />   onclick="javascript:document.photoupdate.submit()" /> 
 <input type ="hidden" name="action" value="'.$action.'" />  <input type="hidden" name="action" value="'.$action.'" />
 <input type ="hidden" name="state" value="photoupdate" />  <input type="hidden" name="state" value="photoupdate" />
 </form>';  </form>';
                 }                  }
     }      }
Line 2486  onclick="javascript:document.photoupdate Line 2531  onclick="javascript:document.photoupdate
         }          }
     }      }
     if (keys(%newenv) > 0) {      if (keys(%newenv) > 0) {
         &Apache::lonnet::appenv(%newenv);          &Apache::lonnet::appenv(\%newenv);
     }      }
     &print_reply($r,$response,$$tasktitleref{$action});      &print_reply($r,$response,$$tasktitleref{$action});
     return;      return;
Line 2506  sub print_photoupdate_response { Line 2551  sub print_photoupdate_response {
     my %LC_code;      my %LC_code;
     my %affiliates;      my %affiliates;
     my $outcome;      my $outcome;
     &get_institutional_codes(\%settings,,\@allcourses,\%LC_code);      &Apache::loncommon::get_institutional_codes(\%settings,\@allcourses,\%LC_code);
     if (@allcourses > 0) {      if (@allcourses > 0) {
         @{$affiliates{$crs}} = @allcourses;          @{$affiliates{$crs}} = @allcourses;
         $outcome = &Apache::lonnet::auto_photoupdate(\%affiliates,$dom,$crs,\%changes);          $outcome = &Apache::lonnet::auto_photoupdate(\%affiliates,$dom,$crs,\%changes);
Line 2519  sub print_photoupdate_response { Line 2564  sub print_photoupdate_response {
         }          }
         if ($outcome eq 'ok') {          if ($outcome eq 'ok') {
             if (keys(%changes) > 0) {              if (keys(%changes) > 0) {
                 $response = &mt('Update of photos for registered students resulted in the following ').': <br /><script type="text/javascript">                  $response = &mt('Update of photos for registered students resulted in the following ').': <br />'
                              .'<script type="text/javascript" language="JavaScript">
 function photowindow(photolink) {  function photowindow(photolink) {
     var title = "Photo_Viewer";      var title = "Photo_Viewer";
     var options = "scrollbars=1,resizable=1,menubar=0";      var options = "scrollbars=1,resizable=1,menubar=0";
Line 2610  sub print_update_result () { Line 2656  sub print_update_result () {
     } 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";
     } else {      } else {
         &get_institutional_codes(\%settings,\@allcourses,\%LC_code);          &Apache::loncommon::get_institutional_codes(\%settings,\@allcourses,\%LC_code);
  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);
Line 2644  sub print_update_result () { Line 2690  sub print_update_result () {
     return;      return;
 }  }
   
 sub get_institutional_codes {  
     my ($settings,$allcourses,$LC_code) = @_;  
 # Get complete list of course sections to update  
     my @currsections = ();  
     my @currxlists = ();  
     my $coursecode = $$settings{'internal.coursecode'};  
       
     if ($$settings{'internal.sectionnums'} ne '') {  
         @currsections = split(/,/,$$settings{'internal.sectionnums'});  
     }  
       
     if ($$settings{'internal.crosslistings'} ne '') {  
         @currxlists = split(/,/,$$settings{'internal.crosslistings'});  
     }  
       
     if (@currxlists > 0) {  
         foreach (@currxlists) {  
             if (m/^([^:]+):(\w*)$/) {  
                 unless (grep/^$1$/,@{$allcourses}) {  
                     push @{$allcourses},$1;  
                     $$LC_code{$1} = $2;  
                 }  
             }  
         }  
     }  
                                                                                          
     if (@currsections > 0) {  
         foreach (@currsections) {  
             if (m/^(\w+):(\w*)$/) {  
                 my $sec = $coursecode.$1;  
                 my $lc_sec = $2;  
                 unless (grep/^$sec$/,@{$allcourses}) {  
                     push @{$allcourses},$sec;  
                     $$LC_code{$sec} = $lc_sec;  
                 }  
             }  
         }  
     }  
     return;   
 }  
   
   
 sub print_viewclass_response {  sub print_viewclass_response {
     my ($r,$realm,$dom,$crs,$action,$tasktitleref) = @_;      my ($r,$realm,$dom,$crs,$action,$tasktitleref) = @_;
     my $response;      my $response;
Line 2740  sub print_viewclass_response { Line 2744  sub print_viewclass_response {
             } elsif ($newtype eq '') {              } elsif ($newtype eq '') {
                 $newlock = '1';                  $newlock = '1';
             }              }
             my $modreply = &Apache::lonnet::modify_student_enrollment($udom,$uname,$uid,'','','','',$section,$end,$start,$newtype,$newlock,$cid);              my $modreply = &Apache::lonnet::modify_student_enrollment($udom,$uname,$uid,'','','','',$section,$end,$start,$newtype,$newlock,$cid,'','chgtype');
             if ($modreply eq 'ok') {              if ($modreply eq 'ok') {
                 $chgok ++;                  $chgok ++;
                 $chg{$student} = "Changed to $change";                  $chg{$student} = "Changed to $change";
Line 2772  sub print_viewclass_response { Line 2776  sub print_viewclass_response {
                 $newlockname = &mt('unlocked');                  $newlockname = &mt('unlocked');
                 $oldlockname = &mt('locked');                   $oldlockname = &mt('locked'); 
             }              }
             my $lockreply = &Apache::lonnet::modify_student_enrollment($udom,$uname,$uid,'','','','',$section,$end,$start,$type,$newlock,$cid);              my $lockreply = &Apache::lonnet::modify_student_enrollment($udom,$uname,$uid,'','','','',$section,$end,$start,$type,$newlock,$cid,'','chgtype');
             if ($lockreply eq 'ok') {              if ($lockreply eq 'ok') {
                 $lockok ++;                  $lockok ++;
                 $lockchg{$student} = 'Changed to '.$newlockname;                  $lockchg{$student} = 'Changed to '.$newlockname;
Line 2970  sub get_dates_from_form { Line 2974  sub get_dates_from_form {
 sub date_setting_table {  sub date_setting_table {
     my ($starttime,$endtime,$action) = @_;      my ($starttime,$endtime,$action) = @_;
     my ($startform,$endform) = &setup_date_selectors($starttime,$endtime,$action);      my ($startform,$endform) = &setup_date_selectors($starttime,$endtime,$action);
     my $perpetual = '<nobr><label><input type="checkbox" name="no_end_date"';      my $perpetual = '<span class="LC_nobreak"><label><input type="checkbox" name="no_end_date"';
     if (($action eq 'setdates' && defined($endtime) && $endtime == 0) || (($action eq 'setaccess' || $action eq 'updatenow') && ($endtime eq '' || $endtime == 0)) ) {      if (($action eq 'setdates' && defined($endtime) && $endtime == 0) || (($action eq 'setaccess' || $action eq 'updatenow') && ($endtime eq '' || $endtime == 0)) ) {
         $perpetual .= ' checked';          $perpetual .= ' checked';
     }      }
     $perpetual.= ' />'.' no ending date</label></nobr>';      $perpetual.= ' />'.' no ending date</label></span>';
     my $start_table = '';      my $start_table = '';
     $start_table .= "<table>\n";      $start_table .= "<table>\n";
     $start_table .= '<tr><td align="right">Starting Date</td>'.      $start_table .= '<tr><td align="right">Starting Date</td>'.
Removed from v.1.51  
changed lines
  Added in v.1.62.4.1

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