Diff for /loncom/interface/lonmodifycourse.pm between versions 1.5 and 1.9

version 1.5, 2003/12/30 15:46:18 version 1.9, 2004/06/17 18:31:24
Line 197  all settings except course code, course Line 197  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 230  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 279  all settings except course code, course Line 287  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 425  sub modify_course { Line 433  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 549  sub modify_course { Line 556  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'});
                 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 566  sub modify_course { Line 573  sub modify_course {
                 } elsif ($changeowner) {                  } elsif ($changeowner) {
                             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 $outcome = &localenroll::new_course($course_id,$newattr{'courseowner'});                                      my $outcome = &Apache::lonnet::auto_new_course($crs,$dom,$inst_course_id,$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 ").$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 582  sub modify_course { Line 589  sub modify_course {
             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 594  sub modify_course { Line 601  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 718  sub handler { Line 725  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.5  
changed lines
  Added in v.1.9


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