--- loncom/interface/loncoursequeueadmin.pm 2009/08/11 00:39:45 1.1
+++ loncom/interface/loncoursequeueadmin.pm 2011/03/07 02:13:02 1.27
@@ -1,7 +1,7 @@
# The LearningOnline Network
-# Utilities to administer domain course requests and course self-enroll requests
+# Utilities to administer domain course requests and course self-enroll requests
#
-# $Id: loncoursequeueadmin.pm,v 1.1 2009/08/11 00:39:45 raeburn Exp $
+# $Id: loncoursequeueadmin.pm,v 1.27 2011/03/07 02:13:02 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -27,13 +27,17 @@
#
###
+=pod
+
=head1 NAME
Apache::loncoursequeueadmin.pm
=head1 SYNOPSIS
-Adminitsration utilities used by domain coordinators for queued course creation requests, and by course coordinators for queued self-enrollment requests.
+Utilities used by domain coordinators to administer queued course creation requests,
+and by course coordinators for queued self-enrollment requests, and by general
+users to display their queued self-enrollment requests.
This is part of the LearningOnline Network with CAPA project
described at http://www.lon-capa.org.
@@ -46,10 +50,26 @@ described at http://www.lon-capa.org.
=item display_queued_requests()
+=item build_queue_display()
+
=item update_request_queue()
=item get_student_counts()
+=item course_creation()
+
+=item build_batchcreatehash()
+
+=item can_clone_course()
+
+=item get_processtype()
+
+=item queued_selfenrollment()
+
+=item update_coursereq_status()
+
+=item process_official_reqs()
+
=back
=cut
@@ -57,78 +77,115 @@ described at http://www.lon-capa.org.
package Apache::loncoursequeueadmin;
use strict;
-use Apache::Constants qw(:common :http);
use Apache::lonnet;
use Apache::loncommon;
use Apache::lonmsg;
use Apache::lonlocal;
-use LONCAPA;
+use Apache::lonuserutils;
+use LONCAPA qw(:DEFAULT :match);
sub send_selfserve_notification {
- my ($notifylist,$textstr,$cid,$coursedesc,$timestamp,$context,$sender,
- $approvedlist,$rejectedlist) = @_;
+ my ($notifylist,$textstr,$cid,$contextdesc,$timestamp,$context,$sender,
+ $approvedlist,$rejectedlist,$crstype) = @_;
# FIXME locallocaltime needs to be able to take $sender_lh as an argument
# so this can be localized to the recipients date display format/time zone
$timestamp =&Apache::lonlocal::locallocaltime($timestamp);
- my $msgcc;
- my ($rawsubj,@rawmsg,$subject,$message,$namelink);
- $namelink = &Apache::loncommon::aboutmewrapper(
- &Apache::loncommon::plainname($env{'user.name'},$env{'user.domain'}));
+ my ($msgcc,$rawsubj,@rawmsg,$subject,$message,$reviewer,$msgtxt);
+ my ($senderuname,$senderudom) = split(':',$sender);
if ($context eq 'coursemanagers') {
$rawsubj = 'Self-enrollment requests processed';
push(@rawmsg,{
mt => 'Enrollment requests in the following course: [_1] have been processed.',
- args => ["\n$coursedesc\n"],
+ args => ["\n $contextdesc"],
});
} elsif ($context eq 'domainmanagers') {
- $rawsubj = 'Course request';
+ $rawsubj = 'Course/Community requests reviewed';
push(@rawmsg,{
- mt => 'Your request for creation of the following course: [_1], requested on [_2], has been reviewed by a Domain Coordinator.',
- args => ["\n$coursedesc\n","$timestamp\n"],
-
+ mt => 'Course/Community creation requests in the following domain: [_1] have been reviewed.',
+ args => ["\n $contextdesc"],
});
if (ref($textstr) eq 'ARRAY') {
push(@rawmsg,@{$textstr});
}
} elsif ($context eq 'enroller') {
$rawsubj = 'Enrollment request';
+ if ($crstype eq 'community') {
+ $msgtxt = 'Your request for enrollment in the following community: [_1]requested on [_2]has been reviewed by a Coordinator.'
+ } else {
+ $msgtxt = 'Your request for enrollment in the following course: [_1]requested on [_2]has been reviewed by a Course Coordinator.';
+ }
push(@rawmsg,{
- mt => 'Your request for enrollment in the following course: [_1], requested on [_2], has been reviewed by a Course Coordinator.',
- args => ["\n$coursedesc\n","$timestamp\n"],
+ mt => $msgtxt,
+ args => ["\n ".$contextdesc.",\n",$timestamp.",\n"],
});
if (ref($textstr) eq 'ARRAY') {
push(@rawmsg,@{$textstr});
}
} elsif ($context eq 'courserequestor') {
- $rawsubj = 'Course request';
+ if ($crstype eq 'Community') {
+ $rawsubj = 'Community request';
+ $msgtxt = 'Your request for creation of the following community: [_1]requested on [_2]has been reviewed by a Domain Coordinator.';
+ } else {
+ $rawsubj = 'Course request';
+ $msgtxt = 'Your request for creation of the following course: [_1]requested on [_2]has been reviewed by a Domain Coordinator.';
+ }
push(@rawmsg,{
- mt => 'Your request for creation of the following course: [_1], requested on [_2], has been reviewed by a Domain Coordinator.',
- args => ["\n$coursedesc\n","$timestamp\n"],
+ mt => $msgtxt,
+ args => ["\n".$contextdesc.",\n",$timestamp.",\n"],
});
if (ref($textstr) eq 'ARRAY') {
push(@rawmsg,@{$textstr});
}
+ } elsif ($context eq 'pendingrequestor') {
+ if ($crstype eq 'Community') {
+ $rawsubj = 'Community request';
+ } else {
+ $rawsubj = 'Processed course request';
+ }
+ if (ref($textstr) eq 'ARRAY') {
+ push(@rawmsg,@{$textstr});
+ }
} elsif ($context eq 'coursereq') {
+ if ($crstype eq 'community') {
+ $rawsubj = 'Community request to review';
+ $msgtxt = 'Creation of the following community: [_1]was requested by [_2] on [_3].';
+ } else {
+ $rawsubj = 'Course request to review';
+ $msgtxt = 'Creation of the following course: [_1]was requested by [_2] on [_3].';
+ }
push(@rawmsg,{
- mt => 'Creation of the following course: [_1] was requested by [_2] on [_3].',
- args => ["\n$coursedesc\n",$textstr,$timestamp],
+ mt => $msgtxt,
+ args => ["\n $contextdesc\n",$textstr,$timestamp],
},
{
- mt =>'As Domain Coordinator, use: [_1]Main Menu -> Create a new course -> Manage Course Requests[_1] to display a list of pending course requests,[_1] which you can either approve or reject.',
- args => ["\n"],
+ mt =>'[_1]As Domain Coordinator, use: [_2]Main Menu -> Course and community creation -> Approve or reject requests[_3]to display a list of pending requests, which you can either approve or reject.',
+ args => ["\n","\n\n ","\n\n"],
});
} elsif ($context eq 'selfenrollreq') {
$rawsubj = 'Self-enrollment request';
+ if ($crstype eq 'community') {
+ $msgtxt = 'Enrollment in the following community: [_1] was requested by [_2] on [_3].'
+ } else {
+ $msgtxt = 'Enrollment in the following course: [_1] was requested by [_2] on [_3].'
+ }
push(@rawmsg,{
- mt => 'Enrollment in the following course: [_1] was requested by [_2] on [_3].',
- args => ["\n$coursedesc\n",$textstr,$timestamp],
- },
+ mt => $msgtxt,
+ args => ["\n $contextdesc\n",$textstr,$timestamp."\n"],
+ });
+ my $directions;
+ if ($crstype eq 'community') {
+ $directions = 'As Coordinator, use: [_1]Main Menu -> Manage Community Users -> Enrollment Requests[_2]to display a list of pending enrollment requests, which you can either approve or reject.';
+ } else {
+ $directions = 'As Course Coordinator, use: [_1]Main Menu -> Manage Course Users -> Enrollment Requests[_2]to display a list of pending enrollment requests, which you can either approve or reject.';
+ }
+ push(@rawmsg,
{
- mt =>'As Course Coordinator, use: [_1]Main Menu -> Manage Course Users -> Enrollment Requests[_1] to display a list of pending enrollment requests,[_1] which you can either approve or reject.',
- args => ["\n"],
+ mt => $directions,
+ args => [" \n\n","\n"],
});
+
}
my @to_notify = split(/,/,$notifylist);
my $numsent = 0;
@@ -149,7 +206,7 @@ sub send_selfserve_notification {
my ($uname,$udom);
if ($sender =~ /:/) {
($uname,$udom) = split(/:/,$sender);
- } else {
+ } elsif ($context eq 'course') {
$uname = $sender;
my %courseinfo = &Apache::lonnet::coursedescription($cid);
$udom = $courseinfo{'num'};
@@ -165,7 +222,7 @@ sub send_selfserve_notification {
$message .= &Apache::lonlocal::mt_user($sender_lh,$item->{mt},@{$item->{args}})."\n";
}
}
- &Apache::lonmsg::process_sent_mail($subject,'',$numsent,$stamp,$uname,$udom,$msgcount,$cid,$$,$message,\@recusers,\@recudoms);
+ &Apache::lonmsg::process_sent_mail($subject,'',$numsent,$stamp,$uname,$udom,$msgcount,$cid,$$,$message,\@recusers,\@recudoms,undef,undef,undef,undef,$senderuname,$senderudom);
my ($recipid,$recipstatus) = &Apache::lonmsg::store_recipients($subject,$uname,$udom,\%reciphash);
my $status;
foreach my $recip (sort(keys(%{$msgcc}))) {
@@ -179,7 +236,7 @@ sub send_selfserve_notification {
@{$item->{args}})."\n";
}
}
- if ($context eq 'managers') {
+ if ($context eq 'coursemanagers') {
if ($approvedlist) {
$message .= "\n\n".&Apache::lonlocal::mt_user($sender_lh,'Approved enrollments:')."\n".$approvedlist;
}
@@ -202,138 +259,208 @@ sub send_selfserve_notification {
sub display_queued_requests {
my ($context,$dom,$cnum) = @_;
- my ($namespace,$formaction,%requesthash);
+ my ($namespace,$formaction,$nextelement,%requesthash);
if ($context eq 'course') {
$formaction = '/adm/createuser';
$namespace = 'selfenrollrequests';
%requesthash = &Apache::lonnet::dump($namespace,$dom,$cnum);
+ $nextelement = '';
} else {
$formaction = '/adm/createcourse';
$namespace = 'courserequestqueue';
- %requesthash = &Apache::lonnet::dump_dom($namespace,$dom,undef,'_approval');
+ my $disposition = 'approval';
+ my $nextphase = 'requestchange';
+ if ($context eq 'pending') {
+ $disposition = 'pending';
+ $nextphase = 'requestvalidation';
+ }
+ %requesthash = &Apache::lonnet::dump_dom($namespace,$dom,'_'.$disposition);
+ $nextelement = '';
}
- my ($output,%queue_by_date,%crstypes);
+ my ($output,%queue_by_date);
if (keys(%requesthash) > 0) {
- $output = '
'.&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 requests awaiting approval.');
- }
}
+ $output .= &Apache::loncommon::end_data_table();
return $output;
}
sub update_request_queue {
my ($context,$cdom,$cnum,$coursedesc) = @_;
my ($output,$access_start,$access_end,$limit,$cap,$notifylist,$namespace,
- $stucounts,$idx,$classlist,%requesthash,$coursedesc,$cid,$hostname,
- $protocol,$now,$sender,$approvedmsg,$rejectedmsg,$beneficiary,
- @existing,@missingreq,@invalidusers,@limitexceeded,@enrolled,@created,
- @enrollerrors,@create_errors,@warn_approves,@warn_rejects,@approvals,
- @rejections);
+ $stucounts,$idx,$classlist,%requesthash,$cid,$domdesc,$now,
+ $sender,$approvedmsg,$rejectedmsg,$beneficiary,
+ @existing,@missingreq,@invalidusers,@limitexceeded,@completed,
+ @processing_errors,@warn_approves,@warn_rejects,@approvals,@warn_dels,
+ @rejections,@rejectionerrors,@nopermissions,%courseroles,
+ %communityroles,%domdefs,%approvalmsg,%rejectionmsg,$crstype,$queue,$firsturl);
@approvals = &Apache::loncommon::get_env_multiple('form.approvereq');
@rejections = &Apache::loncommon::get_env_multiple('form.rejectreq');
$now = time;
@@ -342,30 +469,77 @@ sub update_request_queue {
$namespace = 'selfenrollrequests';
$beneficiary = 'enroller';
$cid = $env{'request.course.id'};
- my $chome = &Apache::lonnet::homeserver($cnum,$cdom);
- $hostname = &Apache::lonnet::hostname($chome);
- $protocol = $Apache::lonnet::protocol{$chome};
- $protocol = 'http' if ($protocol ne 'https');
+ $crstype = lc(&Apache::loncommon::course_type());
+ $firsturl = &course_portal_url($cnum,$cdom);
%requesthash = &Apache::lonnet::dump($namespace,$cdom,$cnum);
$access_start = $env{'course.'.$cid.'.internal.selfenroll_start_access'};
$access_end = $env{'course.'.$cid.'.internal.selfenroll_end_access'};
$limit = $env{'course.'.$cid.'.internal.selfenroll_limit'};
$cap = $env{'course.'.$cid.'.internal.selfenroll_cap'};
$notifylist = $env{'course.'.$cid.'.internal.selfenroll_notifylist'};
- $namespace = 'selfenrollrequests';
($stucounts,$idx,$classlist) = &get_student_counts($cdom,$cnum);
$approvedmsg = [{
mt => 'Your request for enrollment has been approved.',
},
{
mt => 'Visit [_1], to log-in and access the course',
- args => [$protocol.'://'.$hostname],
+ args => [$firsturl],
}];
$rejectedmsg = [{
mt => 'Your request for enrollment has not been approved.',
}];
} else {
- $beneficiary = 'requestor';
+ $domdesc = &Apache::lonnet::domain($cdom);
+ $namespace = 'courserequestqueue';
+ $beneficiary = 'courserequestor';
+ $queue = 'approval';
+ if ($env{'form.queue'} eq 'pending') {
+ $queue = 'pending';
+ }
+ %requesthash = &Apache::lonnet::dump_dom($namespace,$cdom,'_'.$queue);
+ $firsturl= &course_portal_url($cnum,$cdom);
+ my %domconfig = &Apache::lonnet::get_dom('configuration',['requestcourses'],$cdom);
+ if (ref($domconfig{'requestcourses'}) eq 'HASH') {
+ if (ref($domconfig{'requestcourses'}{'notify'}) eq 'HASH') {
+ $notifylist = $domconfig{'requestcourses'}{'notify'}{'approval'};
+ }
+ }
+ $approvalmsg{'course'} =
+ [{
+ mt => 'Your course request has been approved.',
+ },
+ {
+ mt => 'Visit [_1], to log-in and access the course',
+ args => [$firsturl],
+ }];
+ $rejectionmsg{'course'} =
+ [{
+ mt => 'Your course request has not been approved.',
+ }];
+
+ $approvalmsg{'community'} =
+ [{
+ mt => 'Your community request has been approved.',
+ },
+ {
+ mt => 'Visit [_1], to log-in and access the community',
+ args => [$firsturl],
+ }];
+
+ $rejectionmsg{'community'} =
+ [{
+ mt => 'Your community request has not been approved.',
+ }];
+
+ %domdefs = &Apache::lonnet::get_domain_defaults($cdom);
+ my @roles = &Apache::lonuserutils::roles_by_context('course');
+ foreach my $role (@roles) {
+ $courseroles{$role}=&Apache::lonnet::plaintext($role,'Course');
+ }
+ foreach my $role (@roles) {
+ $communityroles{$role}=&Apache::lonnet::plaintext($role,'Community');
+ }
+
}
foreach my $item (sort {$a <=> $b} @approvals) {
if ($context eq 'course') {
@@ -373,7 +547,6 @@ sub update_request_queue {
my $uhome = &Apache::lonnet::homeserver($uname,$udom);
if ($uhome ne 'no_host') {
if (exists($requesthash{$uname.':'.$udom})) {
-
if (exists($classlist->{$uname.':'.$udom})) {
if (ref($classlist->{$uname.':'.$udom}) eq 'ARRAY') {
if (($classlist->{$uname.':'.$udom}->[$idx->{'status'}] eq 'Active') ||
@@ -402,46 +575,138 @@ sub update_request_queue {
my $result =
&Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$usec,$access_end,$access_start,'selfenroll',undef,$cdom.'_'.$cnum,1);
if ($result eq 'ok') {
- push(@enrolled,$uname.':'.$udom);
+ push(@completed,$uname.':'.$udom);
$stucounts->{'allstudents'} ++;
$stucounts->{'selfenrolled'} ++;
&send_selfserve_notification($uname.':'.$udom,$approvedmsg,
- $cid,$coursedesc,$now,$beneficiary,$sender);
- my %userrequest;
- if ($context eq 'course') {
- %userrequest = (
- $cdom.'_'.$cnum => {
- timestamp => $now,
- section => $usec,
- adjudicator => $env{'user.name'}.':'.$env{'user.domain'},
- status => 'approved',
- }
- );
- } else {
- %userrequest = ();
- }
+ $cid,$coursedesc,$now,$beneficiary,$sender,
+ undef,undef,$crstype);
+ my %userrequest = (
+ $cdom.'_'.$cnum => {
+ timestamp => $now,
+ section => $usec,
+ adjudicator => $env{'user.name'}.':'.$env{'user.domain'},
+ status => 'approved',
+ }
+ );
my $userresult =
&Apache::lonnet::put($namespace,\%userrequest,$udom,$uname);
if ($userresult ne 'ok') {
push(@warn_approves,$uname.':'.$udom);
}
} else {
- push(@enrollerrors,$uname.':'.$udom);
+ push(@processing_errors,$uname.':'.$udom);
}
}
} else {
push(@invalidusers,$uname.':'.$udom);
}
} else {
-
+ my ($num,$cnum) = split(':',$item);
+ if (ref($requesthash{$cnum.'_'.$queue}) eq 'HASH') {
+ if (&Apache::lonnet::homeserver($cnum,$cdom) eq 'no_host') {
+ 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;
+ }
+ my $cancreate;
+ if ($cdom eq $ownerdom) {
+ if (&Apache::lonnet::usertools_access($ownername,$ownerdom,$crstype,
+ undef,'requestcourses')) {
+ $cancreate = 1;
+ }
+ } else {
+ my %userenv = &Apache::lonnet::userenvironment($ownerdom,$ownername,'reqcrsotherdom.'.$crstype);
+ if ($userenv{'reqcrsotherdom.'.$crstype}) {
+ my @doms = split(',',$userenv{'reqcrsotherdom.'.$crstype});
+ if (grep(/^\Q$cdom\E:/,@doms)) {
+ $cancreate = 1;
+ }
+ }
+ }
+ if ($cancreate) {
+ my $requestkey = $cdom.'_'.$cnum;
+ my %history =
+ &Apache::lonnet::restore($requestkey,'courserequests',
+ $ownerdom,$ownername);
+ if ((ref($history{'details'}) eq 'HASH') &&
+ ($history{'disposition'} eq $queue)) {
+ my ($logmsg,$newusermsg,$addresult,$enrollcount,$response,$keysmsg);
+ my $result = &course_creation($cdom,$cnum,$context,$history{'details'},\$logmsg,
+ \$newusermsg,\$addresult,\$enrollcount,
+ \$response,\$keysmsg,\%domdefs,$longroles);
+ if ($result eq 'created') {
+ if ($crstype eq 'community') {
+ $approvedmsg = $approvalmsg{'community'};
+ } else {
+ $approvedmsg = $approvalmsg{'course'};
+ }
+ push(@completed,$cnum);
+
+ unless (&Apache::lonnet::del_dom($namespace,[$cnum.'_'.$queue],$cdom) eq 'ok') {
+ push(@warn_dels,$cnum);
+ }
+ &send_selfserve_notification($ownername.':'.$ownerdom,
+ $approvedmsg,$cid,$coursedesc,$now,
+ $beneficiary,$sender,undef,undef,$crstype);
+ my %reqhash = (
+ reqtime => $history{'reqtime'},
+ crstype => $history{'crstype'},
+ details => $history{'details'},
+ disposition => $history{'disposition'},
+ status => 'created',
+ adjudicator => $env{'user.name'}.':'.
+ $env{'user.domain'},
+ );
+ my $userresult =
+ &Apache::lonnet::store_userdata(\%reqhash,$requestkey,
+ 'courserequests',$ownerdom,$ownername);
+ if ($userresult eq 'ok') {
+ my %status = (
+ 'status:'.$cdom.':'.$cnum => 'created'
+ );
+ my $statusresult =
+ &Apache::lonnet::put('courserequests',\%status,
+ $ownerdom,$ownername);
+ if ($statusresult ne 'ok') {
+ push(@warn_approves,$cnum);
+ }
+ }
+ if ($userresult ne 'ok') {
+ push(@warn_approves,$cnum);
+ }
+ } else {
+ push(@processing_errors,$cnum);
+ }
+ } else {
+ push(@processing_errors,$cnum);
+ }
+ } else {
+ push(@nopermissions,$cnum);
+ }
+ } else {
+ push(@existing,$cnum);
+ }
+ } else {
+ push(@missingreq,$cnum);
+ }
}
}
- my @changes = (@enrolled,@rejections);
+ my @changes = (@completed,@rejections);
+ if ($context eq 'domain') {
+ @changes = map {$_.'_'.$queue} (@changes);
+ }
if (@rejections) {
- foreach my $user (@rejections) {
- &send_selfserve_notification($user,$rejectedmsg,$cid,$coursedesc,
- $now,$beneficiary,$sender);
+ foreach my $item (@rejections) {
if ($context eq 'course') {
+ my $user = $item;
+ &send_selfserve_notification($user,$rejectedmsg,$cid,$coursedesc,
+ $now,$beneficiary,$sender,undef,undef,
+ $crstype);
my ($uname,$udom) = split(/:/,$user);
my %userrequest = (
$cdom.'_'.$cnum => {
@@ -456,7 +721,63 @@ sub update_request_queue {
push(@warn_rejects,$user);
}
} else {
-
+ my $cnum = $item;
+ if (ref($requesthash{$cnum.'_'.$queue}) eq 'HASH') {
+ if (&Apache::lonnet::homeserver($cnum,$cdom) eq 'no_host') {
+ my $requestkey = $cdom.'_'.$cnum;
+ 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 {
+ $rejectedmsg = $rejectionmsg{'course'};
+ }
+ &send_selfserve_notification($ownername.':'.$ownerdom,$rejectedmsg,
+ $cid,$coursedesc,$now,$beneficiary,
+ $sender,undef,undef,$crstype);
+ my %history =
+ &Apache::lonnet::restore($requestkey,'courserequests',
+ $ownerdom,$ownername);
+ if ((ref($history{'details'}) eq 'HASH') &&
+ ($history{'disposition'} eq $queue)) {
+ my %reqhash = (
+ reqtime => $history{'reqtime'},
+ crstype => $history{'crstype'},
+ details => $history{'details'},
+ disposition => $history{'disposition'},
+ status => 'rejected',
+ adjudicator => $env{'user.name'}.':'.$env{'user.domain'},
+ );
+ my $userresult =
+ &Apache::lonnet::store_userdata(\%reqhash,$requestkey,
+ 'courserequests',$ownerdom,$ownername);
+ if ($userresult eq 'ok') {
+ my %status = (
+ 'status:'.$cdom.':'.$cnum => 'rejected'
+ );
+ my $statusresult =
+ &Apache::lonnet::put('courserequests',\%status,
+ $ownerdom,$ownername);
+ if ($statusresult ne 'ok') {
+ push(@warn_rejects,$cnum);
+ }
+ } else {
+ push(@warn_rejects,$cnum);
+ }
+ unless (&Apache::lonnet::del_dom($namespace,[$cnum.'_'.$queue],$cdom) eq 'ok') {
+ push(@warn_dels,$cnum);
+ }
+ } else {
+ push(@warn_rejects,$cnum);
+ }
+ } else {
+ push(@existing,$cnum);
+ }
+ } else {
+ push(@rejectionerrors,$cnum);
+ }
}
}
}
@@ -473,10 +794,14 @@ sub update_request_queue {
my ($chgmsg,$approvedlist,$rejectedlist);
if ($context eq 'course') {
$chgmsg = "'Action was taken on the following enrollment requests by [_1].',$namelink";
- if (@enrolled) {
- $approvedlist = join("\n",@enrolled);
- $output .= '
'.&mt('The following were enrolled in the course:').'
';
- foreach my $user (@enrolled) {
+ if (@completed) {
+ $approvedlist = join("\n",@completed);
+ if ($crstype eq 'community') {
+ $output .= '
'.&mt('The following were enrolled in the community:').'
';
+ } else {
+ $output .= '
'.&mt('The following were enrolled in the course:').'
';
+ }
+ foreach my $user (@completed) {
my ($uname,$udom) = split(/:/,$user);
my $userlink =
&Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$udom),$uname,$udom);
@@ -492,13 +817,49 @@ sub update_request_queue {
}
$output .= '
';
}
+ if ($notifylist ne '') {
+ &send_selfserve_notification($notifylist,$chgmsg,$cid,$coursedesc,
+ $now,'coursemanagers',$sender,
+ $approvedlist,$rejectedlist,$crstype);
+ }
} else {
-
-
+ $chgmsg = "'Action was taken on the following course and community requests by [_1].',$namelink";
+ if (@completed) {
+ $approvedlist = join("\n",@completed);
+ $output .= '
'.&mt('The following courses/communities were created:').'
';
+ foreach my $cnum (@completed) {
+ my $showcourse;
+ if (ref($requesthash{$cnum.'_'.$queue})) {
+ $showcourse = $requesthash{$cnum.'_'.$queue}{'description'};
+ } else {
+ $showcourse = $cnum;
+ }
+ my $syllabuslink =
+ &Apache::loncommon::syllabuswrapper($showcourse,$cnum,$cdom);
+ $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:').'
'.
+ &Apache::loncommon::end_data_table_header_row();
+ my @sorted = sort { $a <=> $b } (keys(%reqs_by_date));
+ foreach my $item (@sorted) {
+ if (ref($reqs_by_date{$item}) eq 'ARRAY') {
+ foreach my $crs (@{$reqs_by_date{$item}}) {
+ my %courseinfo = &Apache::lonnet::coursedescription($crs);
+ my $usec = $selfenrollrequests{$crs}{'section'};
+ my $rolename = &Apache::lonnet::plaintext('st',$courseinfo{'type'},$crs);
+ if ($usec eq '') {
+ $usec = &mt('No section');
+ }
+ $output .= &Apache::loncommon::start_data_table_row().
+ '
'.&Apache::lonlocal::locallocaltime($item).'
'.
+ '
'.$courseinfo{'description'}.'
'.
+ '
'.$rolename.'
'.$usec.'
'.
+ &Apache::loncommon::end_data_table_row();
+ }
+ }
+ }
+ $output .= &Apache::loncommon::end_data_table();
+ }
+ return $output;
+}
+
+sub update_coursereq_status {
+ my ($reqhash,$dom,$cnum,$reqstatus,$context,$udom,$uname) = @_;
+ my ($storeresult,$statusresult,$output);
+ my $requestkey = $dom.'_'.$cnum;
+ if ($requestkey =~ /^($match_domain)_($match_courseid)$/) {
+ $storeresult = &Apache::lonnet::store_userdata($reqhash,$requestkey,
+ 'courserequests',$udom,$uname);
+ if ($storeresult eq 'ok') {
+ my %status = (
+ 'status:'.$dom.':'.$cnum => $reqstatus,
+ );
+ $statusresult = &Apache::lonnet::put('courserequests',\%status,$udom,$uname);
+ }
+ } 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);
+ if ($context eq 'domain') {
+ $output .= "\n";
+ } else {
+ $output = ''.$output.' ';
+ }
+ &Apache::lonnet::logthis("Error saving course request - $requestkey for $uname:$udom - $storeresult");
+ } elsif ($statusresult ne 'ok') {
+ $output = &mt('An error occurred saving a record of the status of your request: [_1].',$statusresult);
+ if ($context eq 'domain') {
+ $output .= "\n";
+ } else {
+ $output = ''.$output.' ';
+ }
+ &Apache::lonnet::logthis("Error saving course request status for $requestkey (for $uname:$udom) - $statusresult");
+ }
+ return ($storeresult,$output);
+}
+
+sub process_official_reqs {
+ my ($context,$dom,$dcname,$dcdom) = @_;
+ my $reqsnamespace = 'courserequestqueue';
+ my %requesthash =
+ &Apache::lonnet::dump_dom($reqsnamespace,$dom,'_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';
+ my $cid = $dom.'_'.$cnum;
+ push(@{$newcids{$instcode}},$cid);
+ if ($dcname && $dcdom) {
+ my $firsturl = &course_portal_url($cnum,$dom);
+ my $beneficiary = 'pendingrequestor';
+ my $now = time;
+ my $owner = $ownername.':'.$ownerdom;
+ my $approvedmsg =
+ [{
+ mt => 'Your requested course: [_1], (queued pending validation) has now been created.',
+ args => [$cdescr],
+ },
+ {
+ mt => 'Visit [_1], to log-in and access the course.',
+ args => [$firsturl],
+ },
+ {
+ mt => 'If currently logged-in to LON-CAPA, log-out and log-in again to select your new course role.'
+ }];
+ my $sender = $dcname.':'.$dcdom;
+ &send_selfserve_notification($owner,$approvedmsg,
+ $cid,$cdescr,$now,
+ $beneficiary,$sender,
+ undef,undef,$crstype);
+ }
+ }
+ } 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',$ownerdom,
+ $ownername);
+ 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.').'