'.
- &mt('No course was found matching your choice of institutional course category.');
- if ($code_chk ne '') {
- $message .= ' '.$code_chk;
- }
- $message .= '
';
- }
+ if ($checkedcode) {
+ if ($codechk eq 'valid') {
+ $message = '
'.
- &mt('No course was found matching your choice of institutional course category.');
- }
- unless ($code_chk eq 'ok') {
+ &mt('No course was found matching your choice of institutional course category.');
+ if ($codechk ne '') {
+ $message .= ' '.$codechk;
+ }
+ $message .= '
'.&mt('You have no matching course requests awaiting approval by a Domain Coordinator or held in a queue pending administrative action at your institution.').'
';
}
$output .= '
-
-';
+
+
';
return $output;
}
+sub print_cancel_request {
+ my ($dom,$cnum) = @_;
+ my $requestkey = $dom.'_'.$cnum;
+ my ($result,$output);
+ if ($requestkey =~ /^($match_domain)_($match_courseid)$/) {
+ my %history = &Apache::lonnet::restore($requestkey,'courserequests',
+ $env{'user.domain'},$env{'user.name'});
+ my $timestamp = $history{'reqtime'};
+ my $crstype = $history{'crstype'};
+ my $status = $history{'status'};
+ if (($status eq 'cancelled') || ($status eq 'created')) {
+ if ($status eq 'cancelled') {
+ $output = &mt('This request has already been cancelled.');
+ } elsif ($status eq 'created') {
+ $output = &mt('This request has already been processed, and a course created.');
+ }
+ $output = &mt('No further action will be taken');
+ } elsif (ref($history{'details'}) eq 'HASH') {
+ my ($types,$typename) = &course_types();
+ my $showtype = $crstype;
+ if (defined($typename->{$crstype})) {
+ $showtype = $typename->{$crstype};
+ }
+ $output = '
');
}
@@ -1491,6 +2082,8 @@ sub print_request_outcome {
my ($dom,$codetitles,$code_order) = @_;
my ($output,$cnum,$now,$req_notifylist,$crstype,$enrollstart,$enrollend,
%sections,%crosslistings,%personnel,@baduname,@missingdom,%domconfig,);
+ my $sectotal = $env{'form.sectotal'};
+ my $crosslisttotal = 0;
$cnum = $env{'form.cnum'};
unless ($cnum =~ /^$match_courseid$/) {
$output = &mt('Invalid LON-CAPA course number for the new course')."\n";
@@ -1505,6 +2098,7 @@ sub print_request_outcome {
}
$now = time;
$crstype = $env{'form.crstype'};
+ my @instsections;
if ($crstype eq 'official') {
if (&Apache::lonnet::auto_run('',$dom)) {
($enrollstart,$enrollend)=&dates_from_form('enrollstart','enrollend');
@@ -1512,7 +2106,11 @@ sub print_request_outcome {
for (my $i=0; $i<$env{'form.sectotal'}; $i++) {
if ($env{'form.sec_'.$i}) {
if ($env{'form.secnum_'.$i} ne '') {
- $sections{$i}{'inst'} = $env{'form.secnum_'.$i};
+ my $sec = $env{'form.secnum_'.$i};
+ $sections{$i}{'inst'} = $sec;
+ if (($sec ne '') && (!grep(/^\Q$sec\E$/,@instsections))) {
+ push(@instsections,$sec);
+ }
$sections{$i}{'loncapa'} = $env{'form.loncapasec_'.$i};
}
}
@@ -1527,16 +2125,21 @@ sub print_request_outcome {
}
}
}
- $xlistinfo .= $env{'form.crosslist_'.$i.'_instsec'};
- $crosslistings{$i}{'inst'} = $xlistinfo;
+ $crosslistings{$i}{'instcode'} = $xlistinfo;
+ if ($xlistinfo ne '') {
+ $crosslisttotal ++;
+ }
+ $crosslistings{$i}{'instsec'} = $env{'form.crosslist_'.$i.'_instsec'};
$crosslistings{$i}{'loncapa'} = $env{'form.crosslist_'.$i.'_lcsec'};
}
}
+ } else {
+ $enrollstart = '';
+ $enrollend = '';
}
-
for (my $i=0; $i<$env{'form.persontotal'}; $i++) {
my $uname = $env{'form.person_'.$i.'_uname'};
- my $udom = $env{'form.person_'.$i.'_uname'};
+ my $udom = $env{'form.person_'.$i.'_dom'};
if (($uname =~ /^$match_username$/) && ($udom =~ /^$match_domain$/)) {
if (&Apache::lonnet::domain($udom) ne '') {
unless (ref($personnel{$uname.':'.$udom}) eq 'HASH') {
@@ -1548,7 +2151,7 @@ sub print_request_outcome {
}
my $role = $env{'form.person_'.$i.'_role'};
unless ($role eq '') {
- if (ref(@{$personnel{$uname.':'.$udom}{'roles'}}) eq 'ARRAY') {
+ if (ref($personnel{$uname.':'.$udom}{'roles'}) eq 'ARRAY') {
my @curr_roles = @{$personnel{$uname.':'.$udom}{'roles'}};
unless (grep(/^\Q$role\E$/,@curr_roles)) {
push(@{$personnel{$uname.':'.$udom}{'roles'}},$role);
@@ -1559,15 +2162,17 @@ sub print_request_outcome {
if ($role eq 'cc') {
@{$personnel{$uname.':'.$udom}{$role}{'usec'}} = ();
} else {
- my @currsec;
- if ($env{'form.person_'.$i.'_sections'} ne '') {
- my @sections = split(',',$env{'form.person_'.$i.'_sections'});
- foreach my $sec (@sections) {
- next if ($sec eq '');
- if (@currsec > 0) {
- unless(grep(/^\Q$sec\E$/,@currsec)) {
- push(@currsec,$sec);
- }
+ my @currsec = &Apache::loncommon::get_env_multiple('form.person_'.$i.'_sec');
+ my $newsec = $env{'form.person_'.$i.'_newsec'};
+ $newsec =~ s/^\s+//;
+ $newsec =~s/\s+$//;
+ my @newsecs = split(/[\s,;]+/,$newsec);
+ foreach my $sec (@newsecs) {
+ next if ($sec =~ /\W/);
+ next if ($newsec eq 'none');
+ if ($sec ne '') {
+ unless (grep(/^\Q$sec\E$/,@currsec)) {
+ push(@currsec,$sec);
}
}
}
@@ -1582,6 +2187,37 @@ sub print_request_outcome {
}
}
my ($accessstart,$accessend) = &dates_from_form('accessstart','accessend');
+ my $autodrops = 0;
+ if ($env{'form.autodrops'}) {
+ $autodrops = $env{'form.autodrops'};
+ }
+ my $autoadds = 0;
+ if ($env{'form.autoadds'}) {
+ $autodrops = $env{'form.autoadds'};
+ }
+ if ($env{'form.autoadds'}) {
+ $autodrops = $env{'form.autoadds'};
+ }
+ my $instcode = '';
+ if (exists($env{'form.instcode'})) {
+ $instcode = $env{'form.instcode'};
+ }
+ my $clonecrs = '';
+ my $clonedom = '';
+ if (($env{'form.clonecrs'} =~ /^($match_courseid)$/) &&
+ ($env{'form.clonedom'} =~ /^($match_domain)$/)) {
+ my $clonehome = &Apache::lonnet::homeserver($env{'form.clonecrs'},
+ $env{'form.clonedom'});
+ if ($clonehome ne 'no_host') {
+ my $canclone =
+ &Apache::loncoursequeueadmin::can_clone_course($env{'user.name'},
+ $env{'user.domain'},$env{'form.clonecrs'}, $env{'form.clonedom'});
+ if ($canclone) {
+ $clonecrs = $env{'form.clonecrs'};
+ $clonedom = $env{'form.clonedom'};
+ }
+ }
+ }
my $details = {
owner => $env{'user.name'},
domain => $env{'user.domain'},
@@ -1590,43 +2226,45 @@ sub print_request_outcome {
coursehome => $env{'form.chome'},
cdescr => $env{'form.cdescr'},
crstype => $env{'form.crstype'},
- instcode => $env{'form.instcode'},
- clonedom => $env{'form.clonedom'},
- clonecrs => $env{'form.clonecrs'},
+ instcode => $instcode,
+ clonedom => $clonedom,
+ clonecrs => $clonecrs,
datemode => $env{'form.datemode'},
- dateshift => $env{'form.datshift'},
- sectotal => $env{'form.sectotal'},
+ dateshift => $env{'form.dateshift'},
+ sectotal => $sectotal,
sections => \%sections,
- crosslisttotal => $env{'form.crosslisttotal'},
+ crosslisttotal => $crosslisttotal,
crosslists => \%crosslistings,
- autoadds => $env{'form.autoadds'},
- autodrops => $env{'form.autodrops'},
+ autoadds => $autoadds,
+ autodrops => $autodrops,
enrollstart => $enrollstart,
enrollend => $enrollend,
accessstart => $accessstart,
accessend => $accessend,
personnel => \%personnel,
};
- my @inststatuses;
+ my (@inststatuses,$storeresult,$creationresult);
my $val = &get_processtype($dom,$crstype,\@inststatuses,\%domconfig);
if ($val eq '') {
if ($crstype eq 'official') {
- $output = &mt('You are not permitted to request creation of official courses');
+ $output = &mt('You are not permitted to request creation of official courses.');
} elsif ($crstype eq 'unofficial') {
- $output = &mt('You are not permitted to request creation of unofficial courses');
+ $output = &mt('You are not permitted to request creation of unofficial courses.');
} elsif ($crstype eq 'community') {
$output = &mt('You are not permitted to request creation of communities');
} else {
$output = &mt('Unrecognized course type: [_1]',$crstype);
}
+ $storeresult = 'notpermitted';
} else {
- my ($disposition,$message);
+ my ($disposition,$message,$reqstatus);
my %reqhash = (
- timestamp => $now,
+ reqtime => $now,
crstype => $crstype,
details => $details,
);
my $requestkey = $dom.'_'.$cnum;
+ my $validationerror;
if ($val eq 'autolimit=') {
$disposition = 'process';
} elsif ($val =~ /^autolimit=(\d+)$/) {
@@ -1634,43 +2272,69 @@ sub print_request_outcome {
$disposition = &check_autolimit($env{'user.name'},$env{'user.domain'},
$dom,$crstype,$limit,\$message);
} elsif ($val eq 'validate') {
- $disposition =
- &Apache::lonnet::auto_courserequest_validation($dom,$details,
- \@inststatuses,\$message);
+ my ($inststatuslist,$validationchk,$validation);
+ if (@inststatuses > 0) {
+ $inststatuslist = join(',',@inststatuses);
+ }
+ my $instseclist;
+ if (@instsections > 0) {
+ $instseclist = join(',',@instsections);
+ }
+ $validationchk =
+ &Apache::lonnet::auto_courserequest_validation($dom,
+ $env{'user.name'}.':'.$env{'user.domain'},$crstype,
+ $inststatuslist,$instcode,$instseclist);
+ if ($validationchk =~ /:/) {
+ ($validation,$message) = split(':',$validationchk);
+ } else {
+ $validation = $validationchk;
+ }
+ if ($validation =~ /^error(.*)$/) {
+ $disposition = 'approval';
+ $validationerror = $1;
+ } else {
+ $disposition = $validation;
+ }
} else {
$disposition = 'approval';
}
- $reqhash{'status'} = $disposition;
+ $reqhash{'disposition'} = $disposition;
+ $reqstatus = $disposition;
+ my ($modified,$queued);
if ($disposition eq 'rejected') {
$output = &mt('Your course request was rejected.');
if ($message) {
$output .= '
'.$message.'
';
}
+ $storeresult = 'rejected';
} elsif ($disposition eq 'process') {
+ my %domdefs = &Apache::lonnet::get_domain_defaults($dom);
+ my ($logmsg,$newusermsg,$addresult,$enrollcount,$response,$keysmsg,%longroles);
+ my @roles = &Apache::lonuserutils::roles_by_context('course');
my $type = 'Course';
if ($crstype eq 'community') {
$type = 'Community';
}
- my %domdefs = &Apache::lonnet::get_domain_defaults($dom);
- my ($logmsg,$newusermsg,$addresult,$enrollcount,$response,$keysmsg,%longroles);
- my @roles = &Apache::lonuserutils::roles_by_context('course');
foreach my $role (@roles) {
$longroles{$role}=&Apache::lonnet::plaintext($role,$type);
}
- my $owneremail;
- my %emails = &Apache::loncommon::getemails();
- foreach my $email ('permanentemail','critnotification','notification') {
- $owneremail = $emails{$email};
- last if ($owneremail ne '');
- }
- my %reqdetails = &build_batchcreatehash($dom,$details,$owneremail,\%domdefs);
- my $cid = &LONCAPA::batchcreatecourse::build_course($dom,$cnum,'requestcourses',\%reqdetails,\%longroles,\$logmsg,\$newusermsg,\$addresult,\$enrollcount,\$output,\$keysmsg,$env{'user.domain'},$env{'user.name'},$cnum,$crstype);
- $disposition = 'created';
- if ($cid eq "/$dom/$cnum") {
+ my $result = &Apache::loncoursequeueadmin::course_creation($dom,$cnum,
+ 'autocreate',$details,\$logmsg,\$newusermsg,\$addresult,
+ \$enrollcount,\$response,\$keysmsg,\%domdefs,\%longroles);
+ if ($result eq 'created') {
$disposition = 'created';
- $output = &mt('Your course request has been processed and the course has been created.').' '.&mt('You will need to logout and log-in again to be able to select a role in the course.');
+ $reqstatus = 'created';
+ $output = &mt('Your course request has been processed and the course has been created.').
+ ' '.
+ &mt('You will need to logout and log-in again to be able to select a role in the course.');
+ $creationresult = 'created';
} else {
- $output = &mt('An error occurred when processing your course request.').' '.&mt('You may want to review the request details and submit the request again.');
+ $output = ''.
+ &mt('An error occurred when processing your course request.').
+ ' '.
+ &mt('You may want to review the request details and submit the request again.').
+ '';
+ $creationresult = 'error';
}
} else {
my $requestid = $cnum.'_'.$disposition;
@@ -1683,56 +2347,103 @@ sub print_request_outcome {
description => $env{'form.cdescr'},
},
};
- my $putresult = &Apache::lonnet::newput_dom('courserequestqueue',$request,
- $dom);
- if ($putresult eq 'ok') {
- my %emails = &Apache::loncommon::getemails();
- my $address;
- if (($emails{'permanentemail'} ne '') || ($emails{'notification'} ne '')) {
- $address = $emails{'permanentemail'};
- if ($address eq '') {
- $address = $emails{'notification'};
- }
- }
- $output = &mt('Your course request has been recorded.').' ';
- if ($disposition eq 'approval') {
- $output .= &mt('Your course request has been recorded.').' '.
- &mt('A message will be sent to your LON-CAPA account when a domain coordinator takes action on your request.').' '.
- &mt('To access your LON-CAPA message, go to the Main Menu and click on "Send and Receive Messages".').' ';
- if ($address ne '') {
- $output.= &mt('An e-mail will also be sent to: [_1] when this occurs.',$address).' ';
- }
- if ($req_notifylist) {
- my $fullname = &Apache::loncommon::plainname($env{'user.name'},
- $env{'user.domain'});
- &Apache::loncoursequeueadmin::send_selfserve_notification($req_notifylist,$fullname,$now,$dom,$details);
- }
+ my $statuskey = 'status:'.$dom.':'.$cnum;
+ my %userreqhash = &Apache::lonnet::get('courserequests',[$statuskey],
+ $env{'user.domain'},$env{'user.name'});
+ if ($userreqhash{$statuskey} ne '') {
+ $modified = 1;
+ my $uname = &Apache::lonnet::get_domainconfiguser($dom);
+ my %queuehash = &Apache::lonnet::get('courserequestqueue',
+ [$cnum.'_approval',
+ $cnum.'_pending'],$dom,$uname);
+ if (($queuehash{$cnum.'_approval'} ne '') ||
+ ($queuehash{$cnum.'_pending'} ne '')) {
+ $queued = 1;
+ }
+ }
+ unless ($queued) {
+ my $putresult = &Apache::lonnet::newput_dom('courserequestqueue',$request,
+ $dom);
+ if ($putresult eq 'ok') {
+ $output = &mt('Your course request has been recorded.').' '.
+ ¬ification_information($disposition,$req_notifylist,
+ $cnum,$now);
} else {
- $output .= '
'.
-&mt('Your request has been placed in a queue pending administrative action.').' '.
-&mt("Usually this means that your institution's information systems do not list you among the instructional personnel for this course.").' '.
-&mt('The list of instructional personnel for the course will be automatically checked daily, and once you are listed the request will be processed.').
- '
';
+ $reqstatus = 'domainerror';
+ $reqhash{'disposition'} = $disposition;
+ my $warning = &mt('An error occurred saving your request in the pending requests queue.');
+ $output = ''.$warning.' ';
}
- } else {
- $reqhash{'status'} = 'domainerror';
- $reqhash{'disposition'} = $disposition;
- my $warning = &mt('An error occurred saving your request in the pending requests queue.');
- $output = ''.$warning.' ';
-
}
}
- my $storeresult;
+ my ($statusresult);
if ($requestkey =~ /^($match_domain)_($match_courseid)$/) {
$storeresult = &Apache::lonnet::store_userdata(\%reqhash,$requestkey,
'courserequests');
+ if ($storeresult eq 'ok') {
+ my %status = (
+ 'status:'.$dom.':'.$cnum => $reqstatus,
+ );
+ $statusresult = &Apache::lonnet::put('courserequests',\%status);
+ }
} else {
$storeresult = 'error: invalid requestkey format';
}
if ($storeresult ne 'ok') {
$output .= ''.&mt('An error occurred saving a record of the details of your request: [_1].',$storeresult).' ';
&Apache::lonnet::logthis("Error saving course request - $requestkey for $env{'user.name'}:$env{'user.domain'} - $storeresult");
+ } elsif ($statusresult ne 'ok') {
+ $output .= ''.&mt('An error occurred saving a record of the status of your request: [_1].',$statusresult).' ';
+ &Apache::lonnet::logthis("Error saving course request status for $requestkey (for $env{'user.name'}:$env{'user.domain'}) - $statusresult");
+ }
+ if ($modified && $queued && $storeresult eq 'ok') {
+ $output .= '
'.&mt('Your course request has been updated').'
'.
+ ¬ification_information($disposition,$req_notifylist,$cnum,$now);
}
+ if ($validationerror ne '') {
+ $output .= ''.&mt('An error occurred validating your request with institutional data sources: [_1].',$validationerror).'';
+ }
+ }
+ if ($creationresult ne '') {
+ return ($creationresult,$output);
+ } else {
+ return ($storeresult,$output);
+ }
+}
+
+sub notification_information {
+ my ($disposition,$req_notifylist,$cnum,$now) = @_;
+ my %emails = &Apache::loncommon::getemails();
+ my $address;
+ if (($emails{'permanentemail'} ne '') || ($emails{'notification'} ne '')) {
+ $address = $emails{'permanentemail'};
+ if ($address eq '') {
+ $address = $emails{'notification'};
+ }
+ }
+ my $output;
+ if ($disposition eq 'approval') {
+ $output .= &mt('A message will be sent to your LON-CAPA account when a domain coordinator takes action on your request.').' '.
+ &mt('To access your LON-CAPA message, go to the Main Menu and click on "Send and Receive Messages".').' ';
+ if ($address ne '') {
+ $output.= &mt('An e-mail will also be sent to: [_1] when this occurs.',$address).' ';
+ }
+ if ($req_notifylist) {
+ my $fullname = &Apache::loncommon::plainname($env{'user.name'},
+ $env{'user.domain'});
+ my $sender = $env{'user.name'}.':'.$env{'user.domain'};
+ &Apache::loncoursequeueadmin::send_selfserve_notification($req_notifylist,"$fullname ($env{'user.name'}:$env{'user.domain'})",$cnum,$env{'form.cdescr'},$now,'coursereq',$sender);
+ }
+ } elsif ($disposition eq 'pending') {
+ $output .= '
'.
+&mt('Your request has been placed in a queue pending administrative action.').' '.
+&mt("Usually this means that your institution's information systems do not list you among the instructional personnel for this course.").' '.
+&mt('The list of instructional personnel for the course will be automatically checked daily, and once you are listed the request will be processed.').
+ '
';
+ } else {
+ $output .= '
'.
+ &mt('Your request status is: [_1].',$disposition).
+ '