Diff for /loncom/interface/lonmodifycourse.pm between versions 1.3 and 1.14

version 1.3, 2003/12/28 18:27:49 version 1.14, 2004/11/27 17:23:09
Line 30  use Apache::lonlocal; Line 30  use Apache::lonlocal;
 use Apache::londropadd;  use Apache::londropadd;
 use LONCAPA::Enrollment;  use LONCAPA::Enrollment;
 use lib '/home/httpd/lib/perl';  use lib '/home/httpd/lib/perl';
 use localenroll;  
   
 sub print_course_selection_page {  sub print_course_selection_page {
     my ($r,$tasklongref) = @_;      my ($r,$tasklongref) = @_;
     my $dom = $ENV{'user.domain'};      my $dom = $ENV{'request.role.domain'};
     my %lt=&Apache::lonlocal::texthash(      my %lt=&Apache::lonlocal::texthash(
                     'csae' => "Course settings for automated enrollment",                      'csae' => "Course settings for automated enrollment",
                     'unst' => "Unlike standard LON-CAPA course parameters, such as course description, feedback addresses, and top level map, which are displayed and/or modified using the 'Course Environment Parameters' screen, settings that control automated enrollment based on classlist data available from your institution's student information system are handled differently.  Automated enrollment settings fall into two groups: (a) settings that can be modified by a Course Coordinator using the Automated Enrollment Manager and (b)  settings that may only be modified by a Domain Coordinator via the 'View/Modify Course settings' menu accessed from this page.",                       'unst' => "Unlike standard LON-CAPA course parameters, such as course description, feedback addresses, and top level map, which are displayed and/or modified using the 'Course Environment Parameters' screen, settings that control automated enrollment based on classlist data available from your institution's student information system are handled differently.  Automated enrollment settings fall into two groups: (a) settings that can be modified by a Course Coordinator using the Automated Enrollment Manager and (b)  settings that may only be modified by a Domain Coordinator via the 'View/Modify Course settings' menu accessed from this page.", 
Line 46  sub print_course_selection_page { Line 45  sub print_course_selection_page {
     );      );
                                                                                                                                                                               
 # Determine the courses  # Determine the courses
     my %courseIDs = &Apache::lonnet::courseiddump($dom,'.',1);      my %courseIDs = &Apache::lonnet::courseiddump($dom,'.',1,'.','.');
     &print_header($r,$tasklongref);      &print_header($r,$tasklongref);
     $r->print(<<ENDBLOCK);      $r->print(<<ENDBLOCK);
 <form action="/adm/modifycourse" method="post" name="cmod">  <form action="/adm/modifycourse" method="post" name="cmod">
Line 66  ENDBLOCK Line 65  ENDBLOCK
     foreach my $key (sort keys %courseIDs) {      foreach my $key (sort keys %courseIDs) {
 # Get current code  # Get current code
         my $crs;          my $crs;
         my $currcode;          my ($description,$currcode,$owner);
         if ($key =~ m/^($dom)_(\w+)$/) {          if ($courseIDs{$key} =~ m/^([^:]*):([^:]+)/ ) {
               $currcode = $2;
           } elsif ($key =~ m/^($dom)_(\w+)$/) {
             $crs = $2;              $crs = $2;
             my %settings = &Apache::lonnet::get('environment',['internal.coursecode'],$dom,$crs);              my %settings = &Apache::lonnet::get('environment',['internal.coursecode'],$dom,$crs);
             if (defined($settings{'internal.coursecode'}) ) {              if (defined($settings{'internal.coursecode'}) ) {
                 $currcode = $settings{'internal.coursecode'};                  $currcode = $settings{'internal.coursecode'};
                 if ($currcode eq '') {  
                     $currcode = "___".$iter;  
                     $iter ++;  
                 }  
     } else {  
                 $currcode = "___".$iter;  
                 $iter ++;  
             }              }
         } else {          }
           if ($currcode eq '') {
             $currcode = "___".$iter;              $currcode = "___".$iter;
             $iter ++;                  $iter ++;
         }          }
         unless (grep/^$currcode$/,@codes) {          unless (grep/^$currcode$/,@codes) {
             push @codes,$currcode;              push @codes,$currcode;
Line 100  ENDBLOCK Line 95  ENDBLOCK
             unless ($code =~m/^___\d+$/) {  $showcode = $code; }              unless ($code =~m/^___\d+$/) {  $showcode = $code; }
             if ($item =~ m/^($dom)_(\w+)$/) {              if ($item =~ m/^($dom)_(\w+)$/) {
                 $crs = $2;                  $crs = $2;
                 $description = $courseIDs{$item};                  if ($courseIDs{$item} =~ /^([^:]*):([^:]*):([^:]*)/) {
                       $description = &Apache::lonnet::unescape($1);
                       $owner = &Apache::lonnet::unescape($3);
                   } elsif ($courseIDs{$item} =~ /^([^:]*):([^:]*)$/) {
                       $description = &Apache::lonnet::unescape($1);
                   } else {   
                       $description = &Apache::lonnet::unescape($courseIDs{$item});
                   }
 # Get course owner  # Get course owner
                 my %settings = &Apache::lonnet::get('environment',['internal.courseowner'],$dom,$crs);                  if ($owner eq '') {
                 if ( defined($settings{'internal.courseowner'}) ) {                      my %settings = &Apache::lonnet::get('environment',['internal.courseowner'],$dom,$crs);
                     $owner = $settings{'internal.courseowner'};                      if ( defined($settings{'internal.courseowner'}) ) {
                           $owner = $settings{'internal.courseowner'};
                       }
                   }
                   unless ($owner eq '') {
                     $ownername = &Apache::loncommon::plainname($owner,$dom);                      $ownername = &Apache::loncommon::plainname($owner,$dom);
                 }                  }
                 $r->print("<option value=\"$crs\">$showcode -- $description ---------- $ownername");                  $r->print("<option value=\"$crs\">$showcode -- $description ---------- $ownername");
Line 126  sub print_course_modification_page { Line 132  sub print_course_modification_page {
     my %enrollvar = ();      my %enrollvar = ();
     my $javascript_validations;      my $javascript_validations;
     my $course = '';      my $course = '';
     my $dom = $ENV{'user.domain'};      my $dom = $ENV{'request.role.domain'};
     if ( defined($ENV{'form.course'}) ) {      if ( defined($ENV{'form.course'}) ) {
         $course = $ENV{'form.course'};          $course = $ENV{'form.course'};
     }      }
Line 136  sub print_course_modification_page { Line 142  sub print_course_modification_page {
     } else {      } else {
         $ok_course = &check_course($dom,$course);          $ok_course = &check_course($dom,$course);
     }      }
       print STDERR "Response was $ok_course for $dom,$course\n";
   
     unless ($ok_course eq 'ok') {      unless ($ok_course eq 'ok') {
         &print_header($r,$tasklongref,'',\$javascript_validations);          &print_header($r,$tasklongref,'',\$javascript_validations);
Line 197  all settings except course code, course Line 204  all settings except course code, course
         } else {          } else {
             $enrollvar{$1} = localtime($settings{$item});              $enrollvar{$1} = localtime($settings{$item});
         }          }
             } else {              } elsif ($1 eq "courseowner" || $1 eq "authtype" || $1 eq "autharg" || $1 eq "sectionnums" || $1 eq "coursecode" || $1 eq "crosslistings") {
         $enrollvar{$1} = $settings{$item};          $enrollvar{$1} = $settings{$item};
             }              }
           } elsif ($item =~ m/^default_enrollment_(start|end)_date$/) {
               if ( ($1 eq 'end') && ($settings{$item} == 0) ) {
                   $enrollvar{$item} = $lt{'noen'};
               } elsif ( ($1 eq 'start') && ($settings{$item} eq '') ) {
                   $enrollvar{$item} = 'When enrolled';
               } else {
                   $enrollvar{$item} = localtime($settings{$item});
               }
         }          }
     }      }
   
Line 222  all settings except course code, course Line 237  all settings except course code, course
         }          }
     }      }
     unless ( (grep/^$enrollvar{'courseowner'}$/,@local_ccs) || ($enrollvar{'courseowner'} eq '') )  {      unless ( (grep/^$enrollvar{'courseowner'}$/,@local_ccs) || ($enrollvar{'courseowner'} eq '') )  {
         push @local_ccs, $enrollvar{'coursecode'};          push @local_ccs, $enrollvar{'courseowner'};
         $pname{$enrollvar{'courseowner'}} =  &Apache::loncommon::plainname($enrollvar{'courseowner'},$dom);          $pname{$enrollvar{'courseowner'}} =  &Apache::loncommon::plainname($enrollvar{'courseowner'},$dom);
         $active_cc = &LONCAPA::Enrollment::check_user_status($dom,$enrollvar{'coursecode'},$dom,$course,'cc');          $active_cc = &LONCAPA::Enrollment::check_user_status($dom,$enrollvar{'coursecode'},$dom,$course,'cc');
         if ($active_cc eq 'ok') {          if ($active_cc eq 'ok') {
Line 234  all settings except course code, course Line 249  all settings except course code, course
     my $numlocalcc = @local_ccs;      my $numlocalcc = @local_ccs;
     my $bodytag=&Apache::loncommon::bodytag(&mt("Modify Course Settings"));      my $bodytag=&Apache::loncommon::bodytag(&mt("Modify Course Settings"));
     my $helplink=&Apache::loncommon::help_open_topic('Modify_Course',&mt("Help on Modifying Courses"));      my $helplink=&Apache::loncommon::help_open_topic('Modify_Course',&mt("Help on Modifying Courses"));
     my $defdom=$ENV{'request.role.domain'};      my ($krbdef,$krbdefdom)=&Apache::loncommon::get_kerberos_defaults($dom);
     my ($krbdef,$krbdefdom)=&Apache::loncommon::get_kerberos_defaults($defdom);  
     my $curr_authtype = '';      my $curr_authtype = '';
     my $curr_authfield = '';      my $curr_authfield = '';
     if ($enrollvar{'authtype'} =~ /^krb/) {      if ($enrollvar{'authtype'} =~ /^krb/) {
Line 279  all settings except course code, course Line 293  all settings except course code, course
  <td>$$typeref{$key}</td>   <td>$$typeref{$key}</td>
  <td>$enrollvar{$key}</td>   <td>$enrollvar{$key}</td>
  </tr>";   </tr>";
        $iter ++;          $iter ++;
     }      }
     $disp_table .= "</table>      $disp_table .= "</table>
                    </td>                     </td>
Line 323  all settings except course code, course Line 337  all settings except course code, course
             my $colflag = $i%2;              my $colflag = $i%2;
             $ownertable .= "<tr bgcolor=\"$bgcolors[$colflag]\" align=\"left\">";              $ownertable .= "<tr bgcolor=\"$bgcolors[$colflag]\" align=\"left\">";
             if ($local_ccs[$i] eq $enrollvar{'courseowner'}) {              if ($local_ccs[$i] eq $enrollvar{'courseowner'}) {
                   $ownertable .= "<td><input type=\"radio\" name=\"courseowner\" value=\"$i\" checked=\"true\"/></td>";                    $ownertable .= "<td><input type=\"radio\" name=\"courseowner\" value=\"$local_ccs[$i]\" checked=\"true\"/></td>";
             } else {              } else {
                 $ownertable .= "<td><input type=\"radio\" name=\"courseowner\" value=\"$i\" /></td>";                  $ownertable .= "<td><input type=\"radio\" name=\"courseowner\" value=\"$local_ccs[$i]\" /></td>";
             }              }
             $ownertable .= "              $ownertable .= "
                  <td>$pname{$local_ccs[$i]}</td>                   <td>$pname{$local_ccs[$i]}</td>
                  <td><input type=\"hidden\" name=\"username_$i\" value=\"$local_ccs[$i]\" />$local_ccs[$i]</td>                   <td>$local_ccs[$i]</td>
                  <td>$cc_status{$local_ccs[$i]} $lt{'ccor'}</td></tr>";                   <td>$cc_status{$local_ccs[$i]} $lt{'ccor'}</td></tr>";
         }          }
         $ownertable .= "</table>          $ownertable .= "</table>
Line 418  $disp_table Line 432  $disp_table
 <br/>  <br/>
 ENDDOCUMENT  ENDDOCUMENT
     &print_footer($r);      &print_footer($r);
       return;
 }  }
   
 sub modify_course {  sub modify_course {
     my ($r,$tasklongref,$typeref) = @_;      my ($r,$tasklongref,$typeref) = @_;
     my $dom = $ENV{'user.domain'};      my $dom = $ENV{'user.domain'};
     my $crs = $ENV{'form.course'};      my $crs = $ENV{'form.course'};
   
     unless ( &check_course($dom,$crs) eq 'ok' ) {      unless ( &check_course($dom,$crs) eq 'ok' ) {
         &print_header($r,$tasklongref);          &print_header($r,$tasklongref);
         my $reply = "<br/>".&mt("The LON-CAPA course selected was not a valid course for this domain");          my $reply = "<br/>".&mt("The LON-CAPA course selected was not a valid course for this domain");
Line 476  sub modify_course { Line 490  sub modify_course {
         $newattr{'authtype'} = $ENV{'form.login'};          $newattr{'authtype'} = $ENV{'form.login'};
         $newattr{'authtype'} .= $ENV{'form.krbver'};          $newattr{'authtype'} .= $ENV{'form.krbver'};
         $newattr{'autharg'} = $ENV{'form.krbarg'};          $newattr{'autharg'} = $ENV{'form.krbarg'};
         $newattr{'autharg'} =~ tr/a-z/A-Z/;   
     } elsif ($ENV{'form.login'} eq 'int') {      } elsif ($ENV{'form.login'} eq 'int') {
         $newattr{'authtype'} ='internal';          $newattr{'authtype'} ='internal';
         if ((defined($ENV{'form.intarg'})) && ($ENV{'form.intarg'})) {          if ((defined($ENV{'form.intarg'})) && ($ENV{'form.intarg'})) {
Line 496  sub modify_course { Line 509  sub modify_course {
     }      }
   
     if ( exists($ENV{'form.courseowner'}) ) {      if ( exists($ENV{'form.courseowner'}) ) {
          my $ownerparam = 'username_'.$ENV{'form.courseowner'};          $newattr{'courseowner'}=$ENV{'form.courseowner'};
          if ( exists($ENV{"form.$ownerparam"}) ) {            unless ( $newattr{'courseowner'} eq $currattr{'courseowner'} ) {
             $newattr{'courseowner'}=$ENV{"form.$ownerparam"};              $changeowner = 1;
             unless ( $newattr{'courseowner'} eq $currattr{'courseowner'} ) {  
                 $changeowner = 1;  
             }  
         }           } 
     }      }
               
Line 511  sub modify_course { Line 521  sub modify_course {
             $changecode = 1;              $changecode = 1;
         }          }
     }      }
       if ($changeowner == 1 || $changecode == 1) {
           my $courseid_entry = &Apache::lonnet::escape($dom.'_'.$crs).'='.&Apache::lonnet::escape($description).':'.&Apache::lonnet::escape($ENV{'form.coursecode'}).':'.&Apache::lonnet::escape($ENV{'form.courseowner'});
           &Apache::lonnet::courseidput($dom,$courseid_entry,&Apache::lonnet::homeserver($crs,$dom));
       }
   
     foreach (@params) {      foreach (@params) {
         if ($currattr{$_} eq $newattr{$_}) {          if ($currattr{$_} eq $newattr{$_}) {
Line 548  sub modify_course { Line 562  sub modify_course {
                         if ($changecode) {                          if ($changecode) {
                     foreach my $sec (@sections) {                      foreach my $sec (@sections) {
                 if ($sec =~ m/^(.+):/) {                  if ($sec =~ m/^(.+):/) {
                     my $course_id = $newattr{'coursecode'}.$1;                      my $inst_course_id = $newattr{'coursecode'}.$1;
             my $course_check = &localenroll::validate_courseID($course_id);                                      my $course_check = &Apache::lonnet::auto_validate_courseID($crs,$dom,$inst_course_id);
             if ($course_check eq 'ok') {                if ($course_check eq 'ok') {
                                         my $outcome = &localenroll::new_course($course_id,$newattr{'courseowner'});                                          my $outcome = &Apache::lonnet::auto_new_course($crs,$dom,$inst_course_id,$newattr{'courseowner'});
                 my $outcome = 'ok';  
                 unless ($outcome eq 'ok') {                   unless ($outcome eq 'ok') { 
             $warning .= &mt("If automatic enrollment is enabled for LON-CAPA course: ").$description.&mt(", automated enrollment may fail for ").$newattr{'coursecode'}.&mt(" - section $1 for the following reason: $outcome.<br/>");              $warning .= &mt("If automatic enrollment is enabled for LON-CAPA course: ").$description.&mt(", automated enrollment may fail for ").$newattr{'coursecode'}.&mt(" - section $1 for the following reason: $outcome.<br/>");
                 }                  }
Line 563  sub modify_course { Line 576  sub modify_course {
             $warning .= &mt("If automatic enrollment is enabled for LON-CAPA course: ").$description.&mt(", automated enrollment may fail for ").$newattr{'coursecode'}.&mt(" - section $sec because this is not a valid section entry.<br/>");              $warning .= &mt("If automatic enrollment is enabled for LON-CAPA course: ").$description.&mt(", automated enrollment may fail for ").$newattr{'coursecode'}.&mt(" - section $sec because this is not a valid section entry.<br/>");
                 }                  }
             }              }
                 }                   } elsif ($changeowner) {
                               foreach my $sec (@sections) {
                                   if ($sec =~ m/^(.+):/) {
                                       my $inst_course_id = $newattr{'coursecode'}.$1;
                                       my $outcome = &Apache::lonnet::auto_new_course($crs,$dom,$inst_course_id,$newattr{'courseowner'});
                                       unless ($outcome eq 'ok') {
                                           $warning .= &mt("If automatic enrollment is enabled for LON-CAPA course: ").$description.&mt(", automated enrollment may fail for ").$newattr{'coursecode'}.&mt(" - section $1 for the following reason: $outcome.<br/>");
                                       }
                                   } else {
                                       $warning .= &mt("If automatic enrollment is enabled for LON-CAPA course: ").$description.&mt(", automated enrollment may fail for ").$newattr{'coursecode'}.&mt(" - section $sec because this is not a valid section entry.<br/>");
                                   }
                               }
                           }
             } else {              } else {
                 $warning .= &mt("As no section numbers are currently listed for LON-CAPA course: ").$description.&mt(", automated enrollment will not occur for any sections of coursecode: ").$newattr{'coursecode'}."<br/>";                  $warning .= &mt("As no section numbers are currently listed for LON-CAPA course: ").$description.&mt(", automated enrollment will not occur for any sections of coursecode: ").$newattr{'coursecode'}."<br/>";
             }              }
             if ( (@xlists > 0) && ($changeowner) ) {              if ( (@xlists > 0) && ($changeowner) ) {
                 foreach my $xlist (@xlists) {                  foreach my $xlist (@xlists) {
             if ($xlist =~ m/^(.+):/) {              if ($xlist =~ m/^(.+):/) {
                                 my $outcome = &localenroll::new_course($1,$newattr{'courseowner'});                                  my $outcome = &Apache::lonnet::auto_new_course($crs,$dom,$1,$newattr{'courseowner'});
                 unless ($outcome eq 'ok') {                  unless ($outcome eq 'ok') {
             $warning .= &mt("If automatic enrollment is enabled for LON-CAPA course: ").$description.&mt(", automated enrollment may fail for crosslisted class: ").$1.&mt(" for the following reason: $outcome.<br/>");              $warning .= &mt("If automatic enrollment is enabled for LON-CAPA course: ").$description.&mt(", automated enrollment may fail for crosslisted class: ").$1.&mt(" for the following reason: $outcome.<br/>");
                 }                  }
Line 582  sub modify_course { Line 607  sub modify_course {
         }          }
     } else {      } else {
         foreach my $attr (@params) {          foreach my $attr (@params) {
             $nochgresponse .= "<li>$$typeref{$attr} ".&mt("still set to \"").$currattr{$attr}."\".</li>";              $nochgresponse .= "<li>$$typeref{$attr} ".&mt("still set to")." \"".$currattr{$attr}."\".</li>";
         }          }
     }      }
   
Line 660  $bodytag Line 685  $bodytag
  </tr>   </tr>
 </table>  </table>
 ENDTHIS  ENDTHIS
       return;
 }  }
   
 sub print_footer {  sub print_footer {
   my $r = shift;      my $r = shift;
   $r->print(<<ENDBASE);      $r->print(<<ENDBASE);
 <br/>  <br/>
 </body>  </body>
 </html>  </html>
 ENDBASE  ENDBASE
       return;
 }  }
   
 sub check_course {  sub check_course {
     my ($dom,$course) = @_;      my ($dom,$course) = @_;
     my %courseIDs = &Apache::lonnet::courseiddump($dom,'.',1);      my %courseIDs = &Apache::lonnet::courseiddump($dom,'.',1,'.','.');
     my @courses = ();  
     foreach my $key (sort keys %courseIDs) {      foreach my $key (sort keys %courseIDs) {
         if ($key =~ m/^($dom)_(\w+)$/) {          if ($key =~ m/^($dom)_(\w+)$/) {
             push @courses, $2;              if ($2 eq $course) {
                   return 'ok';
               }
         }          }
     }      }
     if (grep/^$course$/,@courses) {      return 'invalid course';
         return 'ok';  
     }  
     else {  
         return 'invalid course';  
     }  
 }  }
   
   
Line 708  sub handler { Line 731  sub handler {
                        'autharg'  => 'Default authentication parameter',                         'autharg'  => 'Default authentication parameter',
                        'autoadds' => 'Automated adds',                         'autoadds' => 'Automated adds',
                        'autodrops' => 'Automated drops',                         'autodrops' => 'Automated drops',
                        'autostart' => 'Date of first enrollment',                         'autostart' => 'Date of first automated enrollment',
                        'autoend' => 'Date of last enrollment',                         'autoend' => 'Date of last automated enrollment',
                          'default_enrollment_start_date' => 'Date of first student access',
                          'default_enrollment_end_date' => 'Date of last student access',
                        'coursecode' => 'Official course code',                         'coursecode' => 'Official course code',
                        'courseowner' => "Username of course owner (\@$dom)",                         'courseowner' => "Username of course owner (\@$dom)",
                        'notifylist' => 'Course Coordinators to be notified of enrollment changes',                         'notifylist' => 'Course Coordinators to be notified of enrollment changes',

Removed from v.1.3  
changed lines
  Added in v.1.14


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