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

Diff for /loncom/interface/lonpopulate.pm between versions 1.54 and 1.67

version 1.54, 2008/03/12 02:45:07 version 1.67, 2009/11/24 14:26:15
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 Student Enrollment</b>";          $page = "<b>".&mt("Automated Enrollment")."</b>";
     } else {      } else {
         $page =  '<a href="/adm/populate">Automated Student 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";
             } elsif ($action eq "newsections") {              } elsif ($action eq "newsections") {
                 $action = "sections";                   $action = "sections"; 
             }              }
             $page .= "-&gt; <a href=\"/adm/populate?action=$action\">".$$tasklongref{$action}."</a> -&gt; <b>result</b>";              $page .= "&raquo; <a href=\"/adm/populate?action=$action\">".$$tasklongref{$action}."</a> &raquo; <b>result</b>";
         } else {          } else {
             $page .=  " -&gt; <b>".$$tasklongref{$action}."</b>";               $page .=  " &raquo; <b>".$$tasklongref{$action}."</b>"; 
         }          }
     }      }
       my $usrmang = &mt('User Management');
       my $autenrl = &mt('Automated Enrollment Manager');
       #LC_pick_box is used in the following. This is only a temporary solution to adapt the site to the design.
     $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="#C5DB99"> 
    <font size="2"><a href="/adm/menu">$realm</a> -&gt; <a href="/adm/createuser">User Management</a> -&gt; $page</font><br/>     <a href="/adm/menu">$realm</a> &raquo; <a href="/adm/createuser">$usrmang</a> &raquo; $page<br/>
   </td>    </td>
   <td align="right" bgcolor="#CCCCFF" valign="top">    <td align="right" bgcolor="#C5DB99" valign="top">
    <font size="+1">Automated Student Enrollment Manager&nbsp;</font>     $autenrl&nbsp;
   </td>    </td>
  </tr>   </tr>
 </table>  </table>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">  <br/>
  <tr>  <table width="100%" border="0" cellpadding="0" cellspacing="0" class="LC_pick_box">
    <tr class="LC_pick_box_row">
 ENDTHIS  ENDTHIS
 }  }
   
Line 245  sub print_navmenu { Line 249  sub print_navmenu {
         $action = $env{'form.action'};          $action = $env{'form.action'};
     }      }
     $r->print(<<ENDONE);      $r->print(<<ENDONE);
   <td width="10" valign="top" bgcolor="#DDFFFF">&nbsp;</td>      <td valign="top" class="LC_pick_box_title">
   <td width="20%" valign="top" bgcolor="#DDFFFF">  
    <br/>  
 ENDONE  ENDONE
     foreach my $task (@{$tasksref}) {      foreach my $task (@{$tasksref}) {
         if ($task eq $action) {          if ($task eq $action) {
Line 270  ENDONE Line 272  ENDONE
     $r->print("      $r->print("
   <p>&nbsp;</p>    <p>&nbsp;</p>
   </td>    </td>
   <td width=\"10\" valign=\"top\" bgcolor=\"#CCCCFF\">&nbsp;</td>    <td valign=\"top\" class=\"LC_pick_box_value\">");
   <td width=\"10\" valign=\"top\" bgcolor=\"#FFFFFF\">&nbsp;</td>  
   <td bgcolor=\"#ffffff\" valign=\"top\">");  
 }  }
   
 ###############################################################  ###############################################################
Line 368  ENDONE Line 368  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 385  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 427  Note: Any students added manually by cou Line 427  Note: Any students added manually by cou
       }        }
       my $dateshow;        my $dateshow;
       if ( ($oldendshow eq '') && ($oldstartshow eq '') ) {        if ( ($oldendshow eq '') && ($oldstartshow eq '') ) {
          $dateshow = "<br/><font size='+1'>Warning</font>. Currently <b>NO</b> first enrollment or last enrollment dates are set. You <b>must</b> use this menu to set a start date and an end date if you plan to utilise automated adds and/or drops in this course.\n";           $dateshow = "<br/>Warning. Currently <b>NO</b> first enrollment or last enrollment dates are set. You <b>must</b> use this menu to set a start date and an end date if you plan to utilise automated adds and/or drops in this course.\n";
       } else {        } else {
          $dateshow = "Currently: First enrollment: <b><i>$oldstartshow</i></b>, Last enrollment: <b><i>$oldendshow</i></b>\n";           $dateshow = "Currently: First enrollment: <b><i>$oldstartshow</i></b>, Last enrollment: <b><i>$oldendshow</i></b>\n";
       }        }
Line 506  ENDTWO Line 506  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 519  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 558  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 576  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 611  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 641  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 656  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 683  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 755  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 846  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 895  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 952  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 977  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 1023  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 Student 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 1109  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 Student 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 1126  onclick="javascript:document.photoupdate Line 1153  onclick="javascript:document.photoupdate
       my ($indexhash,$keylist) = &Apache::lonuserutils::make_keylist_array();        my ($indexhash,$keylist) = &Apache::lonuserutils::make_keylist_array();
       my $classlist = &Apache::loncoursedata::get_classlist();        my $classlist = &Apache::loncoursedata::get_classlist();
       my $secidx = &Apache::loncoursedata::CL_SECTION();        my $secidx = &Apache::loncoursedata::CL_SECTION();
       my ($permission,$allowed) = &Apache::lonuserutils::get_permission();        my $crstype =&Apache::loncommon::course_type();
         my ($permission,$allowed) = &Apache::lonuserutils::get_permission('course',$crstype);
       foreach my $student (keys(%{$classlist})) {        foreach my $student (keys(%{$classlist})) {
           if (exists($permission->{'view_section'})) {            if (exists($permission->{'view_section'})) {
               if ($classlist->{$student}[$secidx] ne $permission->{'view_section'}) {                if ($classlist->{$student}[$secidx] ne $permission->{'view_section'}) {
Line 1162  onclick="javascript:document.photoupdate Line 1190  onclick="javascript:document.photoupdate
               if ($autocount > 0) {                if ($autocount > 0) {
                   $cellcount ++;                    $cellcount ++;
                   $r->print(<<END);                    $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;                         <td><fieldset><legend>Change auto</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>                         <input type="button" value="uncheck all" onclick="javascript:uncheckAll(document.studentform.chgauto)" /></fieldset></td>
 END  END
               }                }
               if ($manualcount > 0) {                if ($manualcount > 0) {
                   $cellcount ++;                    $cellcount ++;
                   $r->print(<<END);                    $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;                         <td><fieldset><legend>Change manual</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>                         <input type="button" value="uncheck all" onclick="javascript:uncheckAll(document.studentform.chgmanual)" /></fieldset></td>
 END  END
               }                }
Line 1179  END Line 1207  END
                   }                    }
                   $cellcount ++;                    $cellcount ++;
                   $r->print(<<END);                    $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;                         <td><fieldset><legend>Lock manual</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>                         <input type="button" value="uncheck all" onclick="javascript:uncheckAll(document.studentform.lockchg)" /></fieldset></td>
 END  END
               }                }
Line 1189  END Line 1217  END
                   }                    }
                   $cellcount ++;                    $cellcount ++;
                   $r->print(<<END);                    $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;                         <td><fieldset><legend>Unlock manual</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>                         <input type="button" value="uncheck all" onclick="javascript:uncheckAll(document.studentform.unlockchg)" /></fieldset></td>
 END  END
               }                }
Line 1224  END Line 1252  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>
Line 1240  sub notifier_tables { Line 1271  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 1285  sub print_accessdate_table { Line 1328  sub print_accessdate_table {
          '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 <b>future enrollments</b> and also <b>currently inactive</b> students (i.e., those for whom access will begin in the future).',           '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".',           'tcha' => 'To change access dates for <b>currently active</b> students, use User Management -> "Manage Course 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 '') ) {
        $dateshow = "<br/><font size='+1'>".&mt('Warning')."</font>.&nbsp;".$lt{'cuno'}." ";         $dateshow = "<br/>".&mt('Warning').".&nbsp;".$lt{'cuno'}." ";
        if ($action eq 'setaccess') {         if ($action eq 'setaccess') {
            $dateshow .= $lt{'ifyo'}."\n";             $dateshow .= $lt{'ifyo'}."\n";
        } elsif ($action eq 'updatenow') {         } elsif ($action eq 'updatenow') {
Line 1469  sub print_chgsettings_response { Line 1512  sub print_chgsettings_response {
  }   }
  if ($autoadds || $autodrops) {   if ($autoadds || $autodrops) {
     $warning = &warning_message($dom,$crs,$action);      $warning = &warning_message($dom,$crs,$action);
     $warn_prefix = "<br/><font size ='+1'><b>Warning</b></font>. Although you indicated that nightly ";      $warn_prefix = "<br/><b>Warning</b>. Although you indicated that nightly ";
     $warn_suffix = " should be enabled, additional action is required.<br/>";      $warn_suffix = " should be enabled, additional action is required.<br/>";
  }   }
  if ($autoadds) {   if ($autoadds) {
Line 1567  sub print_setdates_response { Line 1610  sub print_setdates_response {
         }          }
     }      }
     $warning = &warning_message($dom,$crs,$action);      $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/>";      $warn_prefix = "<br/><b>Warning</b>. Although you set a start and end date for auto-enrollment, additional action is required.<br/>";
     unless ($warning eq '') {      unless ($warning eq '') {
         $response .= $warn_prefix.$warning;          $response .= $warn_prefix.$warning;
     }      }
Line 1617  start and end access dates for this cour Line 1660  start and end access dates for this cour
     } else {      } else {
         $response .= "The last access date for students being added via automated enrollment has been changed to $showend.<br/>";          $response .= "The last access date for students being added via automated enrollment has been changed to $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 />';              $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 -> "Manage 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 1666  start and end access dates for this cour Line 1709  start and end access dates for this cour
         }          }
     }      }
     $warning = &warning_message($dom,$crs,$action);      $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/>";      $warn_prefix = "<br/><b>Warning</b>. 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 '') {      unless ($warning eq '') {
         $response .= $warn_prefix.$warning;          $response .= $warn_prefix.$warning;
     }      }
Line 1974  sub print_crosslistings_response () { Line 2017  sub print_crosslistings_response () {
   
     if (@allxlists > 0) {      if (@allxlists > 0) {
  $warning = &warning_message($dom,$crs,$action);   $warning = &warning_message($dom,$crs,$action);
  $warn_prefix = "<br/><font size ='+1'><b>Warning</b></font>. Although you have selected crosslisted courses to contribute enrollment to this course, additional action is required.<br/>";   $warn_prefix = "<br/><b>Warning</b>. Although you have selected crosslisted courses to contribute enrollment to this course, additional action is required.<br/>";
  unless ($warning eq '') {   unless ($warning eq '') {
     $response .= $warn_prefix.$warning;      $response .= $warn_prefix.$warning;
  }   }
Line 2112  sections which contribute to enrollment Line 2155  sections which contribute to enrollment
           
     if ($seccount > 0) {      if ($seccount > 0) {
  $warning = &warning_message($dom,$crs,$action);   $warning = &warning_message($dom,$crs,$action);
  $warn_prefix = "<br/><font size ='+1'><b>Warning</b></font>. Although you have selected sections to contribute enrollment to this course, additional action is required.<br/>";   $warn_prefix = "<br/><b>Warning</b>. Although you have selected sections to contribute enrollment to this course, additional action is required.<br/>";
  unless ($warning eq '') {   unless ($warning eq '') {
     $response .= $warn_prefix.$warning;      $response .= $warn_prefix.$warning;
  }   }
Line 2283  sub print_sections_response () { Line 2326  sub print_sections_response () {
   
     if (@allsections > 0) {      if (@allsections > 0) {
  $warning = &warning_message($dom,$crs,$action);   $warning = &warning_message($dom,$crs,$action);
  $warn_prefix = "<br/><font size ='+1'><b>Warning</b></font>. Although you have selected sections to contribute enrollment to this course, additional action is required.<br/>";   $warn_prefix = "<br/><b>Warning</b>. Although you have selected sections to contribute enrollment to this course, additional action is required.<br/>";
  unless ($warning eq '') {   unless ($warning eq '') {
     $response .= $warn_prefix.$warning;      $response .= $warn_prefix.$warning;
  }   }
Line 2374  sub print_photo_agreement { Line 2417  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 2407  function agreement_result(caller) { Line 2450  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 2419  function agreement_result(caller) { Line 2462  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 Student 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 2463  sub print_photos_response { Line 2508  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 2518  sub print_photoupdate_response { Line 2563  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 2697  sub print_viewclass_response { Line 2743  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 2729  sub print_viewclass_response { Line 2775  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 2927  sub get_dates_from_form { Line 2973  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.54  
changed lines
  Added in v.1.67

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