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

Diff for /loncom/interface/lonrequestcourse.pm between versions 1.95 and 1.96

version 1.95, 2015/09/01 16:40:20 version 1.96, 2016/04/02 04:30:21
Line 760  function check_can_request(crschoice,act Line 760  function check_can_request(crschoice,act
     var unofficial = '';      var unofficial = '';
     var community = '';      var community = '';
     var textbook = '';      var textbook = '';
       var placement = '';
 END  END
     if (ref($can_request) eq 'HASH') {      if (ref($can_request) eq 'HASH') {
         foreach my $item (keys(%{$can_request})) {          foreach my $item (keys(%{$can_request})) {
Line 773  END Line 774  END
         unofficial => 'You are not permitted to request creation of an unofficial course in this domain.',          unofficial => 'You are not permitted to request creation of an unofficial course in this domain.',
         community => 'You are not permitted to request creation of a community in this domain.',          community => 'You are not permitted to request creation of a community in this domain.',
         textbook => 'You are not permitted to request creation of a textbook course in this domain',          textbook => 'You are not permitted to request creation of a textbook course in this domain',
           placement => 'You are not permitted to request creation of a placement test in this domain',
         all => 'You must choose a specific course type when making a new course request.',          all => 'You must choose a specific course type when making a new course request.',
         allt => '"All types" is not allowed.',          allt => '"All types" is not allowed.',
     );       ); 
Line 802  END Line 804  END
                         return false;                          return false;
                     }                      }
                 } else {                  } else {
                     if (actionchoice == 'new') {                      if (crschoice == 'placement') {
                         alert('$js_lt{'all'}'+'\\n'+'$js_lt{'allt'}');                          if (placement != 1) {
                         return false;                              alert("$js_lt{'placement'}");
                               return false;
                           }
                       } else {
                           if (actionchoice == 'new') {
                               alert('$js_lt{'all'}'+'\\n'+'$js_lt{'allt'}');
                               return false;
                           }
                     }                      }
                 }                  }
             }              }
Line 815  END Line 824  END
 END  END
     my ($pagetitle,$pageinfo,$domaintitle,$earlyout);      my ($pagetitle,$pageinfo,$domaintitle,$earlyout);
     if (ref($can_request) eq 'HASH') {      if (ref($can_request) eq 'HASH') {
         if (($can_request->{'official'}) || ($can_request->{'unofficial'}) || $can_request->{'textbook'}) {          if (($can_request->{'official'}) || ($can_request->{'unofficial'}) || ($can_request->{'textbook'}) || ($can_request->{'placement'})) {
             if ($can_request->{'community'}) {              if ($can_request->{'community'}) {
                 $pagetitle = 'Course/Community Requests';                  $pagetitle = 'Course/Community Requests';
                 $pageinfo = &mt('Request creation of a new course or community, or review your pending requests.');                  $pageinfo = &mt('Request creation of a new course or community, or review your pending requests.');
Line 992  END Line 1001  END
                 $title = &mt('Pending requests for unofficial courses');                  $title = &mt('Pending requests for unofficial courses');
             } elsif ($env{'form.crstype'} eq 'textbook') {              } elsif ($env{'form.crstype'} eq 'textbook') {
                 $title = &mt('Pending requests for textbook courses');                  $title = &mt('Pending requests for textbook courses');
               } elsif ($env{'form.crstype'} eq 'textbook') {
                   $title = &mt('Pending requests for placement tests'); 
             } else {              } else {
                 $title = &mt('Pending course/community requests');                   $title = &mt('Pending course/community requests'); 
             }              }
Line 2093  sub print_personnel_menu { Line 2104  sub print_personnel_menu {
             official => 'Requestor is automatically assigned Course Coordinator role.',              official => 'Requestor is automatically assigned Course Coordinator role.',
         );          );
         $lt{'unofficial'} = $lt{'official'};          $lt{'unofficial'} = $lt{'official'};
         $lt{'textbook'} = $lt{'textbook'};          $lt{'textbook'} = $lt{'official'};
           $lt{'placement'} = $lt{'official'};
         $output .= &Apache::lonhtmlcommon::row_headline().          $output .= &Apache::lonhtmlcommon::row_headline().
                   '<h3>'.&Apache::loncommon::help_open_topic('Course_Request_Personnel').'&nbsp;'.$lt{$crstype}.' '.&mt('Include other personnel?').'</h3>';                    '<h3>'.&Apache::loncommon::help_open_topic('Course_Request_Personnel').'&nbsp;'.$lt{$crstype}.' '.&mt('Include other personnel?').'</h3>';
     }      }
Line 2504  sub print_request_logs { Line 2516  sub print_request_logs {
         if (ref($domconfig{'requestcourses'}) eq 'HASH') {          if (ref($domconfig{'requestcourses'}) eq 'HASH') {
             if (ref($domconfig{'requestcourses'}{'uniquecode'}) eq 'HASH') {              if (ref($domconfig{'requestcourses'}{'uniquecode'}) eq 'HASH') {
                 if ($curr{'crstype'} eq 'any') {                  if ($curr{'crstype'} eq 'any') {
                     my @types = qw(official unofficial community textbook);                      my @types = qw(official unofficial community textbook placement);
                     foreach my $type (@types) {                      foreach my $type (@types) {
                         if ($domconfig{'requestcourses'}{'uniquecode'}{$type}) {                          if ($domconfig{'requestcourses'}{'uniquecode'}{$type}) {
                             $showuniquecode = 1;                              $showuniquecode = 1;
Line 2672  sub reqstatus_names { Line 2684  sub reqstatus_names {
                         rejected  => 'Request rejected',                          rejected  => 'Request rejected',
                         cancelled => 'Request cancelled',                          cancelled => 'Request cancelled',
             );              );
     if (($crstype eq 'official') || ($crstype eq 'unofficial') || ($crstype eq 'textbook')) {      if (($crstype eq 'official') || ($crstype eq 'unofficial') || ($crstype eq 'textbook') || ($crstype eq 'placement')) {
         $statusnames{'created'} = &mt('Course created');          $statusnames{'created'} = &mt('Course created');
     } elsif ($crstype eq 'community') {      } elsif ($crstype eq 'community') {
         $statusnames{'created'} = &mt('Community created');          $statusnames{'created'} = &mt('Community created');
Line 3076  sub courseinfo_form { Line 3088  sub courseinfo_form {
     &js_escape(\%js_lt);      &js_escape(\%js_lt);
     $js_lt{'unofficial'} = $js_lt{'official'};      $js_lt{'unofficial'} = $js_lt{'official'};
     $js_lt{'textbook'} = $js_lt{'official'};      $js_lt{'textbook'} = $js_lt{'official'};
       $js_lt{'placement'} = $js_lt{'official'};
     my $js_validate = <<"ENDJS";      my $js_validate = <<"ENDJS";
 <script type="text/javascript">  <script type="text/javascript">
 // <![CDATA['  // <![CDATA['
Line 3644  sub print_request_outcome { Line 3657  sub print_request_outcome {
                                                         $instcode,$req_notifylist,\@instsections,\%domconfig);                                                          $instcode,$req_notifylist,\@instsections,\%domconfig);
     return ($result,$output,$customized);      return ($result,$output,$customized);
 }  }
       
 sub process_request {  sub process_request {
     my ($r,$lonhost,$dom,$cnum,$crstype,$now,$details,$instcode,$req_notifylist,$instsections,      my ($r,$lonhost,$dom,$cnum,$crstype,$now,$details,$instcode,$req_notifylist,$instsections,
         $domconfig) = @_;           $domconfig) = @_; 
Line 3662  sub process_request { Line 3675  sub process_request {
             $output = &mt('You are not permitted to request creation of communities');              $output = &mt('You are not permitted to request creation of communities');
         } elsif ($crstype eq 'textbook') {          } elsif ($crstype eq 'textbook') {
             $output = &mt('You are not permitted to request creation of textbook courses');              $output = &mt('You are not permitted to request creation of textbook courses');
           } elsif ($crstype eq 'placement') {
               $output = &mt('You are not permitted to request creation of placement tests');
         } else {          } else {
             $output = &mt('Unrecognized course type: [_1]',$crstype);              $output = &mt('Unrecognized course type: [_1]',$crstype);
         }          }
Line 4299  sub check_autolimit { Line 4314  sub check_autolimit {
             if (($crstype eq 'community') &&               if (($crstype eq 'community') && 
                 (exists($crsroles{$cnum.':'.$cdom.':co'}))) {                  (exists($crsroles{$cnum.':'.$cdom.':co'}))) {
                 $count ++;                  $count ++;
             } elsif ((($crstype eq 'official') || ($crstype eq 'unofficial') || ($crstype eq 'textbook')) &&              } elsif ((($crstype eq 'official') || ($crstype eq 'unofficial') || ($crstype eq 'textbook') || ($crstype eq 'placement')) &&
                      (exists($crsroles{$cnum.':'.$cdom.':cc'}))) {                       (exists($crsroles{$cnum.':'.$cdom.':cc'}))) {
                 $count ++;                  $count ++;
             }              }
Removed from v.1.95  
changed lines
  Added in v.1.96

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