'.&mt('Requests for official courses queued pending validation').'
'.
+ '
'.&mt('Requests are validated against institutional data to confirm that the requestor is an instructor of record.').' '.
+ &mt('Validation is attempted when the request is submitted.').' '.&mt('If unvalidated, the request will be held in a queue.').' '.&mt('Validation of pending requests is automatically repeated daily.').'
';
+ } else {
+ $output .= '
'.&mt('Course/Community requests queued pending approval by a Domain Coordinator').'
';
+ if ($context eq 'course') {
+ $output .= &mt('There are currently no enrollment requests awaiting approval.');
+ } elsif ($context eq 'pending') {
+ $output .= &mt('There are currently no requests for official courses awaiting validation.');
+ } elsif ($context eq 'domain') {
+ $output .= &mt('There are currently no course or community requests awaiting approval.');
+ }
+ $output .= '
'.&mt('Any course/community requests which are successfully validated will be created immediately.').' '.&mt('Unvalidated requests will be listed for manual approval/rejection.').'
';
+ if ($context eq 'course') {
+ $output .= &mt('There are currently no enrollment requests awaiting approval.');
+ } elsif ($context eq 'pending') {
+ $output .= &mt('There are currently no requests for official courses awaiting validation.');
+ } else {
+ $output .= &mt('There are currently no course or community requests awaiting approval.');
+ }
+ $output .= '
'."\n";
+ }
+ $output .= &Apache::loncommon::start_data_table_row()."\n".
+ $row.
+ &Apache::loncommon::end_data_table_row()."\n";
+ $count ++;
}
}
- $output .= &Apache::loncommon::end_data_table().
- '';
- } else {
- if ($context eq 'course') {
- $output .= &mt('There are currently no enrollment requests.');
- } else {
- $output .= &mt('There are currently no course or community requests awaiting approval.');
- }
}
+ $output .= &Apache::loncommon::end_data_table();
return $output;
}
@@ -377,7 +449,7 @@ sub update_request_queue {
@existing,@missingreq,@invalidusers,@limitexceeded,@completed,
@processing_errors,@warn_approves,@warn_rejects,@approvals,@warn_dels,
@rejections,@rejectionerrors,@nopermissions,%courseroles,
- %communityroles,%domdefs,%approvalmsg,%rejectionmsg,$crstype);
+ %communityroles,%domdefs,%approvalmsg,%rejectionmsg,$crstype,$queue);
@approvals = &Apache::loncommon::get_env_multiple('form.approvereq');
@rejections = &Apache::loncommon::get_env_multiple('form.rejectreq');
$now = time;
@@ -412,7 +484,11 @@ sub update_request_queue {
$domdesc = &Apache::lonnet::domain($cdom);
$namespace = 'courserequestqueue';
$beneficiary = 'courserequestor';
- %requesthash = &Apache::lonnet::dump_dom($namespace,$cdom,'_approval');
+ $queue = 'approval';
+ if ($env{'form.queue'} eq 'pending') {
+ $queue = 'pending';
+ }
+ %requesthash = &Apache::lonnet::dump_dom($namespace,$cdom,'_'.$queue);
my $chome = &Apache::lonnet::domain($cdom,'primary');
$hostname = &Apache::lonnet::hostname($chome);
$protocol = $Apache::lonnet::protocol{$chome};
@@ -521,12 +597,12 @@ sub update_request_queue {
}
} else {
my ($num,$cnum) = split(':',$item);
- if (ref($requesthash{$cnum.'_approval'}) eq 'HASH') {
+ if (ref($requesthash{$cnum.'_'.$queue}) eq 'HASH') {
if (&Apache::lonnet::homeserver($cnum,$cdom) eq 'no_host') {
- my $ownername = $requesthash{$cnum.'_approval'}{'ownername'};
- my $ownerdom = $requesthash{$cnum.'_approval'}{'ownerdom'};
- $crstype = $requesthash{$cnum.'_approval'}{'crstype'};
- my $coursedesc = $requesthash{$cnum.'_approval'}{'description'};
+ my $ownername = $requesthash{$cnum.'_'.$queue}{'ownername'};
+ my $ownerdom = $requesthash{$cnum.'_'.$queue}{'ownerdom'};
+ $crstype = $requesthash{$cnum.'_'.$queue}{'crstype'};
+ my $coursedesc = $requesthash{$cnum.'_'.$queue}{'description'};
my $longroles = \%courseroles;
if ($crstype eq 'community') {
$longroles = \%communityroles;
@@ -552,7 +628,7 @@ sub update_request_queue {
&Apache::lonnet::restore($requestkey,'courserequests',
$ownerdom,$ownername);
if ((ref($history{'details'}) eq 'HASH') &&
- ($history{'disposition'} eq 'approval')) {
+ ($history{'disposition'} eq $queue)) {
my ($logmsg,$newusermsg,$addresult,$enrollcount,$response,$keysmsg);
my $result = &course_creation($cdom,$cnum,$context,$history{'details'},\$logmsg,
\$newusermsg,\$addresult,\$enrollcount,
@@ -565,7 +641,7 @@ sub update_request_queue {
}
push(@completed,$cnum);
- unless (&Apache::lonnet::del_dom($namespace,[$cnum.'_approval'],$cdom) eq 'ok') {
+ unless (&Apache::lonnet::del_dom($namespace,[$cnum.'_'.$queue],$cdom) eq 'ok') {
push(@warn_dels,$cnum);
}
&send_selfserve_notification($ownername.':'.$ownerdom,$approvedmsg,
@@ -615,7 +691,7 @@ sub update_request_queue {
}
my @changes = (@completed,@rejections);
if ($context eq 'domain') {
- @changes = map {$_.'_approval'} (@changes);
+ @changes = map {$_.'_'.$queue} (@changes);
}
if (@rejections) {
foreach my $item (@rejections) {
@@ -638,13 +714,13 @@ sub update_request_queue {
}
} else {
my $cnum = $item;
- if (ref($requesthash{$cnum.'_approval'}) eq 'HASH') {
+ if (ref($requesthash{$cnum.'_'.$queue}) eq 'HASH') {
if (&Apache::lonnet::homeserver($cnum,$cdom) eq 'no_host') {
my $requestkey = $cdom.'_'.$cnum;
- my $ownername = $requesthash{$cnum.'_approval'}{'ownername'};
- my $ownerdom = $requesthash{$cnum.'_approval'}{'ownerdom'};
- my $coursedesc = $requesthash{$cnum.'_approval'}{'description'};
- $crstype = $requesthash{$cnum.'_approval'}{'crstype'};
+ my $ownername = $requesthash{$cnum.'_'.$queue}{'ownername'};
+ my $ownerdom = $requesthash{$cnum.'_'.$queue}{'ownerdom'};
+ my $coursedesc = $requesthash{$cnum.'_'.$queue}{'description'};
+ $crstype = $requesthash{$cnum.'_'.$queue}{'crstype'};
if ($crstype eq 'community') {
$rejectedmsg = $rejectionmsg{'community'};
} else {
@@ -657,7 +733,7 @@ sub update_request_queue {
&Apache::lonnet::restore($requestkey,'courserequests',
$ownerdom,$ownername);
if ((ref($history{'details'}) eq 'HASH') &&
- ($history{'disposition'} eq 'approval')) {
+ ($history{'disposition'} eq $queue)) {
my %reqhash = (
reqtime => $history{'reqtime'},
crstype => $history{'crstype'},
@@ -682,7 +758,7 @@ sub update_request_queue {
} else {
push(@warn_rejects,$cnum);
}
- unless (&Apache::lonnet::del_dom($namespace,[$cnum.'_approval'],$cdom) eq 'ok') {
+ unless (&Apache::lonnet::del_dom($namespace,[$cnum.'_'.$queue],$cdom) eq 'ok') {
push(@warn_dels,$cnum);
}
} else {
@@ -745,8 +821,8 @@ sub update_request_queue {
$output .= '
'.&mt('The following courses/communities were created:').'
';
foreach my $cnum (@completed) {
my $showcourse;
- if (ref($requesthash{$cnum.'_approval'})) {
- $showcourse = $requesthash{$cnum.'_approval'}{'description'};
+ if (ref($requesthash{$cnum.'_'.$queue})) {
+ $showcourse = $requesthash{$cnum.'_'.$queue}{'description'};
} else {
$showcourse = $cnum;
}
@@ -761,8 +837,8 @@ sub update_request_queue {
$output .= '
'.&mt('The following requests were rejected:').'
';
foreach my $cnum (@rejections) {
my $showcourse;
- if (ref($requesthash{$cnum.'_approval'})) {
- $showcourse = $requesthash{$cnum.'_approval'}{'description'};
+ if (ref($requesthash{$cnum.'_'.$queue})) {
+ $showcourse = $requesthash{$cnum.'_'.$queue}{'description'};
} else {
$showcourse = $cnum;
}
@@ -838,8 +914,8 @@ sub update_request_queue {
$output .= '
'.&mt('The following course/community creation requests could not be processed because the owner does not have rights to create this type of course:').'
';
foreach my $cnum (@nopermissions) {
my $showcourse;
- if (ref($requesthash{$cnum.'_approval'})) {
- $showcourse = $requesthash{$cnum.'_approval'}{'description'};
+ if (ref($requesthash{$cnum.'_'.$queue})) {
+ $showcourse = $requesthash{$cnum.'_'.$queue}{'description'};
} else {
$showcourse = $cnum;
}
@@ -858,8 +934,8 @@ sub update_request_queue {
$output .= '
'.&mt('The following course/community creation requests could not be processed because an error occurred:').'
';
foreach my $cnum (@processing_errors) {
my $showcourse;
- if (ref($requesthash{$cnum.'_approval'})) {
- $showcourse = $requesthash{$cnum.'_approval'}{'description'};
+ if (ref($requesthash{$cnum.'_'.$queue})) {
+ $showcourse = $requesthash{$cnum.'_'.$queue}{'description'};
} else {
$showcourse = $cnum;
}
@@ -872,8 +948,8 @@ sub update_request_queue {
$output .= '
'.&mt('The following course/community creation request rejections could not be fully processed because an error occurred:').'
';
foreach my $cnum (@rejectionerrors) {
my $showcourse;
- if (ref($requesthash{$cnum.'_approval'})) {
- $showcourse = $requesthash{$cnum.'_approval'}{'description'};
+ if (ref($requesthash{$cnum.'_'.$queue})) {
+ $showcourse = $requesthash{$cnum.'_'.$queue}{'description'};
} else {
$showcourse = $cnum;
}
@@ -892,8 +968,8 @@ sub update_request_queue {
$output .= '
'.&mt("For the following course/community requests an error occurred when updating the requestor's own requests record:").'
';
foreach my $cnum (@warn_approves,@warn_rejects) {
my $showcourse;
- if (ref($requesthash{$cnum.'_approval'})) {
- $showcourse = $requesthash{$cnum.'_approval'}{'description'};
+ if (ref($requesthash{$cnum.'_'.$queue})) {
+ $showcourse = $requesthash{$cnum.'_'.$queue}{'description'};
} else {
$showcourse = $cnum;
}
@@ -906,8 +982,8 @@ sub update_request_queue {
$output .= '
'.&mt("For the following course/community requests an error occurred when removing requests for the following from the pending queue:").'
';
foreach my $cnum (@warn_dels) {
my $showcourse;
- if (ref($requesthash{$cnum.'_approval'})) {
- $showcourse = $requesthash{$cnum.'_approval'}{'description'};
+ if (ref($requesthash{$cnum.'_'.$queue})) {
+ $showcourse = $requesthash{$cnum.'_'.$queue}{'description'};
} else {
$showcourse = $cnum;
}
@@ -960,8 +1036,8 @@ sub course_creation {
}
my %reqdetails = &build_batchcreatehash($dom,$context,$details,$owneremail,$domdefs);
my $cid = &LONCAPA::batchcreatecourse::build_course($dom,$cnum,'requestcourses',
- \%reqdetails,$longroles,\$logmsg,\$newusermsg,\$addresult,
- \$enrollcount,\$output,\$keysmsg,$ownerdom,$ownername,$cnum,$crstype);
+ \%reqdetails,$longroles,$logmsg,$newusermsg,$addresult,
+ $enrollcount,$output,$keysmsg,$ownerdom,$ownername,$cnum,$crstype);
if ($cid eq "/$dom/$cnum") {
$result = 'created';
} else {
@@ -1240,4 +1316,148 @@ sub update_coursereq_status {
return ($storeresult,$output);
}
+sub process_official_reqs {
+ my ($context,$dom) = @_;
+ my $reqsnamespace = 'courserequestqueue';
+ my %requesthash =
+ &Apache::lonnet::dump_dom($reqsnamespace,$dom,undef,'_pending');
+ my (%newcids,%longroles,%stillpending);
+ my @courseroles = ('cc','in','ta','ep','ad','st');
+ foreach my $role (@courseroles) {
+ $longroles{$role}=&Apache::lonnet::plaintext($role);
+ }
+ my %domdefs = &Apache::lonnet::get_domain_defaults($dom);
+ my ($output,$linefeed);
+ if ($context eq 'auto') {
+ $linefeed = "\n";
+ } else {
+ $linefeed = ' '."\n";
+ }
+ foreach my $key (keys(%requesthash)) {
+ my ($cnum,$status) = split('_',$key);
+ next if (&Apache::lonnet::homeserver($cnum,$dom) ne 'no_host');
+ if (ref($requesthash{$key}) eq 'HASH') {
+ my $ownername = $requesthash{$key}{'ownername'};
+ my $ownerdom = $requesthash{$key}{'ownerdom'};
+ next if (&Apache::lonnet::homeserver($ownername,$ownerdom) eq 'no_host');
+ my $inststatus;
+ my %userenv =
+ &Apache::lonnet::get('environment',['inststatus'],
+ $ownerdom,$ownername);
+ my ($tmp) = keys(%userenv);
+ if ($tmp !~ /^(con_lost|error|no_such_host)/i) {
+ $inststatus = $userenv{'inststatus'};
+ } else {
+ undef(%userenv);
+ }
+ my $reqkey = $dom.'_'.$cnum;
+ my %history = &Apache::lonnet::restore($reqkey,'courserequests',
+ $ownerdom,$ownername);
+ if (ref($history{'details'}) eq 'HASH') {
+ my $instcode = $history{'details'}{'instcode'};
+ my $crstype = $history{'details'}{'crstype'};
+ my $reqtime = $history{'details'}{'reqtime'};
+ my $cdescr = $history{'details'}{'cdescr'};
+ my @currsec;
+ my $sections = $history{'details'}{'sections'};
+ if (ref($sections) eq 'HASH') {
+ foreach my $i (sort(keys(%{$sections}))) {
+ if (ref($sections->{$i}) eq 'HASH') {
+ my $sec = $sections->{$i}{'inst'};
+ if (!grep(/^\Q$sec\E$/,@currsec)) {
+ push(@currsec,$sec);
+ }
+ }
+ }
+ }
+ my $instseclist = join(',',@currsec);
+ my ($validationchk,$disposition,$reqstatus,$message,
+ $validation,$validationerror);
+ $validationchk =
+ &Apache::lonnet::auto_courserequest_validation($dom,
+ $ownername.':'.$ownerdom,$crstype,$inststatus,
+ $instcode,$instseclist);
+ if ($validationchk =~ /:/) {
+ ($validation,$message) = split(':',$validationchk);
+ } else {
+ $validation = $validationchk;
+ }
+ if ($validation =~ /^error(.*)$/) {
+ $disposition = 'approval';
+ $validationerror = $1;
+ } else {
+ $disposition = $validation;
+ }
+ $reqstatus = $disposition;
+ if ($disposition eq 'process') {
+ my ($logmsg,$newusermsg,$addresult,$enrollcount,$response,$keysmsg);
+ my $result = &course_creation($dom,$cnum,'domain',$history{'details'},\$logmsg,\$newusermsg,\$addresult,\$enrollcount,\$response,\$keysmsg,\%domdefs,\%longroles);
+ if ($result eq 'created') {
+ $disposition = 'created';
+ $reqstatus = 'created';
+ push(@{$newcids{$instcode}},$dom.'_'.$cnum);
+ }
+ } elsif ($disposition eq 'rejected') {
+ $output .= &mt('Queued course request for [_1] submitted by [_2] with status [_3] rejected when validating.',$instcode,$ownername.':'.$ownerdom,$inststatus).$linefeed;
+ } elsif ($disposition eq 'approval') {
+ $output .= &mt('Queued course request for [_1] submitted by [_2] with status [_3] switched to "approval by DC" because of validation error: [_4].',$instcode,$ownername.':'.$ownerdom,$inststatus,$validationerror).$linefeed;
+
+ my $requestid = $cnum.'_'.$disposition;
+ my $request = {
+ $requestid => {
+ timestamp => $reqtime,
+ crstype => $crstype,
+ ownername => $ownername,
+ ownerdom => $ownerdom,
+ description => $cdescr,
+ },
+ };
+ my $putresult = &Apache::lonnet::newput_dom('courserequestqueue',$request,$dom);
+ unless ($putresult eq 'ok') {
+ $output .= &mt("An error occurred saving the modified course request for [_1] submitted by [_2] in the domain's courserequestqueue.db.",$instcode,$ownername.':'.$ownerdom).$linefeed;
+ }
+ } elsif ($disposition eq 'pending') {
+ my $instcode = $requesthash{$key}{'instcode'};
+ my $description = $requesthash{$key}{'description'};
+ my $timestamp = $requesthash{$key}{'timestamp'};
+ my $entry = $cnum.':'.$ownername.':'.$ownerdom.':'.
+ $instcode.':'.$description;
+ if (ref($stillpending{$timestamp}) eq 'ARRAY') {
+ push(@{$stillpending{$timestamp}},$entry);
+ } else {
+ $stillpending{$timestamp} = [$entry];
+ }
+ }
+ unless ($disposition eq 'pending') {
+ my ($statusresult,$output) =
+ &update_coursereq_status(\%requesthash,$dom,$cnum,
+ $reqstatus,'domain');
+ unless (&Apache::lonnet::del_dom($reqsnamespace,[$cnum.'_pending'],$dom) eq 'ok') {
+ $output .= &mt('An error occurred when removing the request for [_1] submitted by [_2] from the pending queue.',$instcode,$ownername.':'.$ownerdom).$linefeed;
+ }
+ }
+ }
+ }
+ }
+ foreach my $key (sort(keys(%newcids))) {
+ if (ref($newcids{$key}) eq 'ARRAY') {
+ $output .= "created course from queued request: $key - ".join(', ',@{$newcids{$key}}).$linefeed;
+ my $newcourse = &LONCAPA::escape($key.':'.$newcids{$key});
+ }
+ }
+ unless ($context eq 'auto') {
+ if (keys(%stillpending) > 0) {
+ $output .= '
'."\n".
+ ''."\n".
+ ''.
+ '
'.&mt('For the following requests, the requestor could [_1]not[_2] be validated as official course personnel, so the request remains in the pending queue.','','').' '.&mt('Requests may be left in the queue, or you can manually approve or reject them.').'