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

version 1.47, 2006/08/10 21:46:40 version 1.51, 2007/12/14 00:20:53
Line 33  use Apache::lonhtmlcommon; Line 33  use Apache::lonhtmlcommon;
 use Apache::lonlocal;  use Apache::lonlocal;
 use Apache::loncoursedata;  use Apache::loncoursedata;
 use Apache::longroup;  use Apache::longroup;
   use Apache::lonuserutils;
 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;
Line 225  sub print_mainbox { Line 226  sub print_mainbox {
 <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/dropadd">Enrollment Manager</a> -&gt; $page</font><br/>     <font size="2"><a href="/adm/menu">$realm</a> -&gt; <a href="/adm/createuser">User Management</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">Automated Enrollment Manager&nbsp;</font>
Line 673  ENDTWO Line 674  ENDTWO
          if ((@ccs + @showdom) > $notifycount) {           if ((@ccs + @showdom) > $notifycount) {
              $r->print(&mt("Check the checkbox(es) to initiate notification for people not currently informed of roster changes from the nightly enrollment update.<br />"));               $r->print(&mt("Check the checkbox(es) to initiate notification for people not currently informed of roster changes from the nightly enrollment update.<br />"));
          }           }
          $r->print(&mt("Click 'Go' to store your changes.")."           $r->print(&mt("Click 'Go' to save your changes.")."
            <br/>             <br/>
            <table width=\"100%\" border=\"0\" cellspadding=\"2\" cellspacing=\"2\">             <table width=\"100%\" border=\"0\" cellspadding=\"2\" cellspacing=\"2\">
             <tr>              <tr>
Line 707  ENDTWO Line 708  ENDTWO
       ");        ");
       if ($cross_str > 0) {        if ($cross_str > 0) {
           $r->print("            $r->print("
                 Currently, this LON-CAPA course is crosslisted with $cross_str course section(s).  Students enrolling in these course sections will be automatically added to the class roster for the course, if you have chosen to enable a nightly automated enrollment update.  For each crosslisting, leave the checkbox checked if you want registered students in that course to be included in the student roster for LON-CAPA course: <b>$realm ($enrollvar{coursecode})</b>; otherwise uncheck it. If you wish to change the section ID assigned in your LON-CAPA course for a crosslisted course, enter the new section ID in the appropriate textbox. The LON-CAPA section ID can be left (or set to) empty, if you do not wish to tie a section ID to this crosslisting. If you wish to add new crosslisted courses, enter the number of new courses to add in the textbox at the bottom of the page. You will provide information about each of the new crosslistings on a subsequent page.  Click 'Go' to store your changes.                  Currently, this LON-CAPA course is crosslisted with $cross_str course section(s).  Students enrolling in these course sections will be automatically added to the class roster for the course, if you have chosen to enable a nightly automated enrollment update.  For each crosslisting, leave the checkbox checked if you want registered students in that course to be included in the student roster for LON-CAPA course: <b>$realm ($enrollvar{coursecode})</b>; otherwise uncheck it. If you wish to change the section ID assigned in your LON-CAPA course for a crosslisted course, enter the new section ID in the appropriate textbox. The LON-CAPA section ID can be left (or set to) empty, if you do not wish to tie a section ID to this crosslisting. If you wish to add new crosslisted courses, enter the number of new courses to add in the textbox at the bottom of the page. You will provide information about each of the new crosslistings on a subsequent page.  Click 'Go' to save your changes.
               </td>                </td>
              </tr>               </tr>
             </table>              </table>
Line 793  ENDTWO Line 794  ENDTWO
               </td>                </td>
              </tr>               </tr>
              <tr>               <tr>
               <td>For each section, check the checkbox if you want registered students in that section to be included in the student roster for LON-CAPA course: <b>$realm ($enrollvar{coursecode})</b>; otherwise uncheck it. If you want to change the section ID designation used for this section in LON-CAPA, delete the current value in the LON-CAPA section ID textbox and enter the new value. The LON-CAPA section ID can be left (or set to) empty, if you do not wish to tie a section ID to this section. To add a new section, check the 'Enrollment in this course?' checkbox, and enter the desired LON-CAPA section ID in the appropriate textbox. Click 'Go' to store                <td>For each section, check the checkbox if you want registered students in that section to be included in the student roster for LON-CAPA course: <b>$realm ($enrollvar{coursecode})</b>; otherwise uncheck it. If you want to change the section ID designation used for this section in LON-CAPA, delete the current value in the LON-CAPA section ID textbox and enter the new value. The LON-CAPA section ID can be left (or set to) empty, if you do not wish to tie a section ID to this section. To add a new section, check the 'Enrollment in this course?' checkbox, and enter the desired LON-CAPA section ID in the appropriate textbox. Click 'Go' to save your changes.</td>
 your changes.</td>  
              </tr>               </tr>
             </table>              </table>
             <br/>              <br/>
Line 854  your changes.</td> Line 854  your changes.</td>
           if (@currsections) {            if (@currsections) {
               my $secshow = @currsections;                my $secshow = @currsections;
               $r->print("                $r->print("
                 Currently, this LON-CAPA course incorporates enrollment from $secshow sections.  Students enrolling in any of these course sections will be automatically added to the class roster for the course, if you have chosen to enable a nightly automated enrollment update. For each section, uncheck the checkbox if you want registered students in that section to cease being included in the student roster for LON-CAPA course: <b>$realm ($enrollvar{coursecode})</b>; otherwise leave it checked. If you want to change the section ID designation used for this section in LON-CAPA, delete the current value in the LON-CAPA section ID textbox and enter the new value.  If you wish to add new course section, enter the number of new sections to add in the textbox at the bottom of the page. You will provide information about each of the new sections on a subsequent page. Click 'Go' to store your changes.                  Currently, this LON-CAPA course incorporates enrollment from $secshow sections.  Students enrolling in any of these course sections will be automatically added to the class roster for the course, if you have chosen to enable a nightly automated enrollment update. For each section, uncheck the checkbox if you want registered students in that section to cease being included in the student roster for LON-CAPA course: <b>$realm ($enrollvar{coursecode})</b>; otherwise leave it checked. If you want to change the section ID designation used for this section in LON-CAPA, delete the current value in the LON-CAPA section ID textbox and enter the new value.  If you wish to add new course section, enter the number of new sections to add in the textbox at the bottom of the page. You will provide information about each of the new sections on a subsequent page. Click 'Go' to save your changes.
               </td>                </td>
              </tr>               </tr>
             </table>              </table>
Line 944  your changes.</td> Line 944  your changes.</td>
       ');        ');
       my ($result,$perm_reqd)=&Apache::lonnet::auto_photo_permission($crs,$dom);        my ($result,$perm_reqd)=&Apache::lonnet::auto_photo_permission($crs,$dom);
       my $can_enable = 1;        my $can_enable = 1;
       my $institution = $Apache::lonnet::domaindescription{$dom};        my $institution = &Apache::lonnet::domain($dom,'description');
       my $user;  
       if ($enrollvar{'courseowner'} =~ /^[^:]+:[^:]+$/) {  
           $user = $env{'user.name'}.':'.$env{'user.domain'};  
       } else {  
           $user = $env{'user.name'};  
       }  
       if ($result eq 'ok') {        if ($result eq 'ok') {
           if ($perm_reqd eq 'yes') {            if ($perm_reqd eq 'yes') {
               if (!($enrollvar{'photopermission'} eq 'yes')) {                if (!($enrollvar{'photopermission'} eq 'yes')) {
                   $can_enable = 0;                    $can_enable = 0;
               } else {                } else {
                   if ($user eq $enrollvar{'courseowner'}) {                    if (&user_is_courseowner($enrollvar{'courseowner'})) {
                       $r->print('                        $r->print('
                     <tr>                      <tr>
                      <td>'.                       <td>'.
Line 983  your changes.</td> Line 977  your changes.</td>
                     <tr>                      <tr>
                      <td>                       <td>
                       <font color="#888888">'.                        <font color="#888888">'.
 &mt('Note: if you enable automatic import of student photos, your course will automatically have access to photos stored by your institution for officially registered students, via a conduit established by your LON-CAPA domain coordinator.').'    &mt('Note: if you enable automatic import of student photos, your course will automatically have access to photos saved by your institution for officially registered students, via a conduit established by your LON-CAPA domain coordinator.').'  
                       </font>                        </font>
                      </td>                       </td>
                     </tr>                      </tr>
 ');  ');
       } else {        } else {
           if ($user eq $enrollvar{'courseowner'}) {            if (&user_is_courseowner($enrollvar{'courseowner'})) {
               $r->print('                $r->print('
                     <tr>                      <tr>
                      <td>'.                       <td>'.
Line 1128  onclick="javascript:document.photoupdate Line 1122  onclick="javascript:document.photoupdate
       }        }
       my $status_select = &Apache::lonhtmlcommon::StatusOptions($env{'form.Status'});        my $status_select = &Apache::lonhtmlcommon::StatusOptions($env{'form.Status'});
 #  Get current classlist  #  Get current classlist
       my ($classlist,$keylist)=&Apache::loncoursedata::get_classlist();        my %userlist;
         my ($indexhash,$keylist) = &Apache::lonuserutils::make_keylist_array();
         my $classlist = &Apache::loncoursedata::get_classlist();
         my $secidx = &Apache::loncoursedata::CL_SECTION();
         my ($permission,$allowed) = &Apache::lonuserutils::get_permission();
         foreach my $student (keys(%{$classlist})) {
             if (exists($permission->{'view_section'})) {
                 if ($classlist->{$student}[$secidx] ne $permission->{'view_section'}) {
                     next;
                 } else {
                     $userlist{$student} = $classlist->{$student};
                 }
             } else {
                 $userlist{$student} = $classlist->{$student};
             }
         }
   
       if (! defined($classlist)) {        if (! defined($classlist)) {
           $r->print(&mt('There are no students either currently or previously enrolled.').            $r->print(&mt('There are no students either currently or previously enrolled.')."
                       "\n");                        </td>
                        </tr>\n");
       } else {        } else {
           $r->print(&mt('Student Status: [_1]',$status_select)."\n");            $r->print(&mt('Student Status: [_1]',$status_select)."\n");
           $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 $context = 'course';
           my ($studentcount,$autocount,$manualcount,$lockcount,$unlockcount) = &Apache::londropadd::show_class_list($r,'autoenroll','nothing',$env{'form.Status'},$classlist,$keylist);            my $mode = 'autoenroll';
             my ($studentcount,$autocount,$manualcount,$lockcount,$unlockcount) = &Apache::lonuserutils::show_users_list($r,$context,$mode,$permission,$env{'form.Status'},\%userlist,$keylist);
           $r->print("            $r->print("
                      </td>                       </td>
                     </tr>                      </tr>
Line 1192  END Line 1204  END
                      </td>                       </td>
                     </tr>                      </tr>
               ");                ");
             } else {
                 $r->print('
                       <tr>
                        <td><br />
                         '.&mt('There are no students with the selected status.').'
                        </td>
                       </tr>
                 ');
           }            }
           $r->print("            $r->print("
                    </table>                     </table>
Line 2283  sub photo_permission { Line 2303  sub photo_permission {
  $dom,$crs);   $dom,$crs);
     my ($showphotos,$response);      my ($showphotos,$response);
     if (exists($env{'form.cancel_agreement'})) {      if (exists($env{'form.cancel_agreement'})) {
         if ($env{'user.name'} eq $settings{'internal.courseowner'}) {          if (&user_is_courseowner($settings{'internal.courseowner'})) {
             my %cenv = (              my %cenv = (
                 'internal.photopermission' => 'no',                  'internal.photopermission' => 'no',
             );              );
Line 2352  sub photo_permission { Line 2372  sub photo_permission {
 sub print_photo_agreement {  sub print_photo_agreement {
     my ($r,$realm,$dom,$crs,$action,$tasktitleref,$conditions,$courseowner)=@_;      my ($r,$realm,$dom,$crs,$action,$tasktitleref,$conditions,$courseowner)=@_;
     my $response;      my $response;
     my $institution = $Apache::lonnet::domaindescription{$dom};      my $institution = &Apache::lonnet::domain($dom,'description');
     if ($env{'user.name'} eq $courseowner) {      if (&user_is_courseowner($courseowner)) {
         $response = '          $response = '
 <script type="text/javascript">  <script type="text/javascript">
 function agreement_result(caller) {  function agreement_result(caller) {
Line 2696  sub print_viewclass_response { Line 2716  sub print_viewclass_response {
        &Apache::loncommon::get_env_multiple('form.unlockchg'));         &Apache::loncommon::get_env_multiple('form.unlockchg'));
   
     foreach my $student (sort @typechglist) {      foreach my $student (sort @typechglist) {
         my ($uname,$udom) = split/:/,$student;          my ($uname,$udom) = split(/:/,$student);
         my $sdata    = $classlist->{$student};          my $sdata    = $classlist->{$student};
         my $section  = $sdata->[$secidx];          my $section  = $sdata->[$secidx];
         my $uid       = $sdata->[$ididx];          my $uid       = $sdata->[$ididx];
Line 2734  sub print_viewclass_response { Line 2754  sub print_viewclass_response {
         }          }
     }      }
     foreach my $student (@lockchglist) {      foreach my $student (@lockchglist) {
         my ($uname,$udom) = split/:/,$student;          my ($uname,$udom) = split(/:/,$student);
         my $sdata    = $classlist->{$student};          my $sdata    = $classlist->{$student};
         my $section  = $sdata->[$secidx];          my $section  = $sdata->[$secidx];
         my $uid       = $sdata->[$ididx];          my $uid       = $sdata->[$ididx];
Line 2763  sub print_viewclass_response { Line 2783  sub print_viewclass_response {
         }          }
     }      }
     if ($chgtotal > 0) {      if ($chgtotal > 0) {
         $response = "You requested a change in enrollment type for $chgtotal students.<br /><br />\n";          $response = &mt('You requested a change in enrollment type for [quant,_1,student].',$chgtotal).'<br /><br />'."\n";
         $classlist = &Apache::loncoursedata::get_classlist($dom,$crs);          $classlist = &Apache::loncoursedata::get_classlist($dom,$crs);
         if ($chgok > 0) {          if ($chgok > 0) {
             $response .= "The following $chgok changes were successful:<br />";              $response .= &mt('The following [quant,_1,change was,changes were] successful;',$chgtotal).':<br /><br />';
             $response .= &enrolltype_result(\%chg,$classlist,$endidx,$startidx,$ididx,$secidx,$typeidx);              $response .= &enrolltype_result(\%chg,$classlist,$endidx,$startidx,$ididx,$secidx,$typeidx);
         }          }
         if ($chgfail > 0) {          if ($chgfail > 0) {
             $response .= "The following $chgfail students were not modified successfully:&nbsp;<br />";              $response .= &mt('The following [quant,_1,student was,students were] not modified successfully',$chgfail).':&nbsp;<br />';
             $response .= &enrolltype_result(\%nochg,$classlist,$endidx,$startidx,$ididx,$secidx,$typeidx);              $response .= &enrolltype_result(\%nochg,$classlist,$endidx,$startidx,$ididx,$secidx,$typeidx);
         }          }
         if ($othdom > 0) {          if ($othdom > 0) {
             $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 .= &mt("The following [quant,_1,student was,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'",$othdom).':<br />'; 
             $response .= &enrolltype_result(\%otherdom,$classlist,$endidx,$startidx,$ididx,$secidx,$typeidx);              $response .= &enrolltype_result(\%otherdom,$classlist,$endidx,$startidx,$ididx,$secidx,$typeidx);
         }          }
         $response .= "<br /><br />";          $response .= "<br /><br />";
     }      }
     if ($locktotal > 0) {      if ($locktotal > 0) {
         $response .= "You requested locking/unlocking for $locktotal manually enrolled students.<br /><br />\n";          $response .= &mt('You requested locking/unlocking for [quant,_1,manually enrolled student]',$locktotal).'<br /><br />'."\n";
         $classlist = &Apache::loncoursedata::get_classlist($dom,$crs);          $classlist = &Apache::loncoursedata::get_classlist($dom,$crs);
         if ($lockok > 0) {          if ($lockok > 0) {
             $response .= "The following $lockok changes were successful:<br />";              $response .= &mt('The following [quant,_1,change was,changes were] successful',$lockok).':<br /><br />';
             $response .= &enrolltype_result(\%lockchg,$classlist,$endidx,$startidx,$ididx,$secidx,$typeidx,$lockedidx);              $response .= &enrolltype_result(\%lockchg,$classlist,$endidx,$startidx,$ididx,$secidx,$typeidx,$lockedidx);
         }          }
         if ($lockfail > 0) {          if ($lockfail > 0) {
             $response .= "The following $lockfail students were not modified successfully:&nbsp;<br />";              $response .= &mt('The following [quant,_1,student was,students were] not modified successfully',$lockfail).':&nbsp;<br />';
             $response .= &enrolltype_result(\%nolockchg,$classlist,$endidx,$startidx,$ididx,$secidx,$typeidx,$lockedidx);              $response .= &enrolltype_result(\%nolockchg,$classlist,$endidx,$startidx,$ididx,$secidx,$typeidx,$lockedidx);
         }          }
     }      }
Line 2797  sub print_viewclass_response { Line 2817  sub print_viewclass_response {
   
 sub enrolltype_result {  sub enrolltype_result {
     my ($changes,$classlist,$endidx,$startidx,$ididx,$secidx,$typeidx,$lockedidx) = @_;      my ($changes,$classlist,$endidx,$startidx,$ididx,$secidx,$typeidx,$lockedidx) = @_;
     my $reply = "      my $reply = &Apache::loncommon::start_data_table().
             <table border='2'>                  &Apache::loncommon::start_data_table_header_row().'
              <tr>  
               <th>username</th>                <th>username</th>
               <th>domain</th>                <th>domain</th>
               <th>ID</th>                <th>ID</th>
Line 2807  sub enrolltype_result { Line 2826  sub enrolltype_result {
               <th>section</th>                <th>section</th>
               <th>start date</th>                <th>start date</th>
               <th>end date</th>                <th>end date</th>
               <th>enrollment change</th>                <th>enrollment change</th>'."\n".
              </tr>";                  &Apache::loncommon::end_data_table_header_row();
     foreach (sort keys %{$changes}) {      foreach my $chg (sort keys %{$changes}) {
         my $sdata  = $classlist->{$_};          my $sdata  = $classlist->{$chg};
         my ($uname,$udom) = split/:/,$_;          my ($uname,$udom) = split(/:/,$chg);
         my $section  = $sdata->[$secidx];          my $section  = $sdata->[$secidx];
         my $uid      = $sdata->[$ididx];          my $uid      = $sdata->[$ididx];
         my $start    = $sdata->[$startidx];          my $start    = $sdata->[$startidx];
Line 2828  sub enrolltype_result { Line 2847  sub enrolltype_result {
             $end = &Apache::lonlocal::locallocaltime($end);              $end = &Apache::lonlocal::locallocaltime($end);
         }          }
         if (!defined($section) || ($section eq '')) {          if (!defined($section) || ($section eq '')) {
             $section eq '&nbsp;';              $section = '&nbsp;';
         }          }
         if (!defined($uid) || ($uid eq '')) {          if (!defined($uid) || ($uid eq '')) {
             $uid = '&nbsp';              $uid = '&nbsp;';
         }          }
         $reply .= "          $reply .= &Apache::loncommon::start_data_table_row().' 
              <tr>                <td>'.$uname.'</td>
               <td>$uname</td>                <td>'.$udom.'</td>
               <td>$udom</td>                <td>'.$uid.'</td>
               <td>$uid</td>                <td>'.&Apache::loncommon::plainname($uname,$udom).'</td>
               <td>".&Apache::loncommon::plainname($uname,$udom)."</td>                <td>'.$section.'</td>
               <td>$section</td>                <td>'.$start.'</td>
               <td>$start</td>                <td>'.$end.'</td>
               <td>$end</td>                <td>'.$$changes{$chg}.'</td>'."\n".
               <td>$$changes{$_}</td>               &Apache::loncommon::end_data_table_row();
              </tr>";  
     }      }
     $reply .= "</table>";      $reply .= &Apache::loncommon::end_data_table();
     return $reply;      return $reply;
 }  }
   
Line 2984  sub validate_lcsec { Line 3002  sub validate_lcsec {
     return 'ok';      return 'ok';
 }  }
   
   sub user_is_courseowner {
       my ($courseowner) = @_;
       my $user;
       if ($courseowner =~ /^[^:]+:[^:]+$/) {
    $user = $env{'user.name'}.':'.$env{'user.domain'};
       } else {
    $user = $env{'user.name'};
       }
       return ($user eq $courseowner);
   }
       
 ###################################################################  ###################################################################
 sub handler {  sub handler {
     my $r = shift;      my $r = shift;

Removed from v.1.47  
changed lines
  Added in v.1.51


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