--- loncom/interface/loncoursequeueadmin.pm 2009/10/04 16:07:11 1.9.2.2
+++ loncom/interface/loncoursequeueadmin.pm 2010/01/14 20:08:13 1.13
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Utilities to administer domain course requests and course self-enroll requests
#
-# $Id: loncoursequeueadmin.pm,v 1.9.2.2 2009/10/04 16:07:11 raeburn Exp $
+# $Id: loncoursequeueadmin.pm,v 1.13 2010/01/14 20:08:13 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -33,7 +33,7 @@ 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.
+Administration utilities used by domain coordinators for queued course creation requests, and by course coordinators for queued self-enrollment requests.
This is part of the LearningOnline Network with CAPA project
described at http://www.lon-capa.org.
@@ -50,6 +50,14 @@ described at http://www.lon-capa.org.
=item get_student_counts()
+=item course_creation()
+
+=item build_batchcreatehash()
+
+=item can_clone_course()
+
+=item get_processtype()
+
=back
=cut
@@ -67,22 +75,22 @@ use LONCAPA;
sub send_selfserve_notification {
my ($notifylist,$textstr,$cid,$contextdesc,$timestamp,$context,$sender,
- $approvedlist,$rejectedlist) = @_;
+ $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,$reviewer);
+ my ($rawsubj,@rawmsg,$subject,$message,$reviewer,$msgtxt);
if ($context eq 'coursemanagers') {
$rawsubj = 'Self-enrollment requests processed';
push(@rawmsg,{
- mt => 'Enrollment requests in the following course: [_1]have been processed.',
+ mt => 'Enrollment requests in the following course: [_1] have been processed.',
args => ["\n $contextdesc"],
});
} elsif ($context eq 'domainmanagers') {
- $rawsubj = 'Course requests reviewed';
+ $rawsubj = 'Course/Community requests reviewed';
push(@rawmsg,{
- mt => 'Course creation requests in the following domain: [_1]have been reviewed.',
+ mt => 'Course/Community creation requests in the following domain: [_1] have been reviewed.',
args => ["\n $contextdesc"],
});
if (ref($textstr) eq 'ARRAY') {
@@ -90,8 +98,13 @@ sub send_selfserve_notification {
}
} 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.',
+ mt => $msgtxt,
args => ["\n ".$contextdesc.",\n",$timestamp.",\n"],
});
@@ -99,9 +112,15 @@ sub send_selfserve_notification {
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.',
+ mt => $msgtxt,
args => ["\n".$contextdesc.",\n",$timestamp.",\n"],
});
@@ -109,35 +128,44 @@ sub send_selfserve_notification {
push(@rawmsg,@{$textstr});
}
} elsif ($context eq 'coursereq') {
- $rawsubj = 'Course request to review',
+ 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].',
+ mt => $msgtxt,
args => ["\n $contextdesc\n",$textstr,$timestamp],
},
{
- mt =>'[_1]As Domain Coordinator, use: [_2]Main Menu -> Create a new course -> Approve or reject course requests[_3]to display a list of pending requests, which you can either approve or reject.',
+ 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].',
+ mt => $msgtxt,
args => ["\n $contextdesc\n",$textstr,$timestamp."\n"],
});
- if ($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Community') {
- push(@rawmsg,
- {
- mt =>'As 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.',
- args => [" \n\n","\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 {
- push(@rawmsg,
+ $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[_2]to display a list of pending enrollment requests, which you can either approve or reject.',
+ mt => $directions,
args => [" \n\n","\n"],
});
- }
}
my @to_notify = split(/,/,$notifylist);
my $numsent = 0;
@@ -188,7 +216,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;
}
@@ -235,12 +263,12 @@ sub display_queued_requests {
if ($context eq 'course') {
$output .= '| '.&mt('Section').' | '.
''.&mt('Date requested').' | ';
+ } else {
%crstypes = &Apache::lonlocal::texthash (
official => 'Official course',
unofficial => 'Unofficial course',
community => 'Community',
);
- } else {
$output .= ''.&mt('Type').' | '.
''.&mt('Date requested').' | '.
''.&mt('Details').' | ';
@@ -332,7 +360,7 @@ sub display_queued_requests {
if ($context eq 'course') {
$output .= &mt('There are currently no enrollment requests.');
} else {
- $output .= &mt('There are currently no course requests awaiting approval.');
+ $output .= &mt('There are currently no course or community requests awaiting approval.');
}
}
return $output;
@@ -346,7 +374,7 @@ sub update_request_queue {
@existing,@missingreq,@invalidusers,@limitexceeded,@completed,
@processing_errors,@warn_approves,@warn_rejects,@approvals,
@rejections,@rejectionerrors,@nopermissions,%courseroles,
- %communityroles,%domdefs,@warn_coursereqs);
+ %communityroles,%domdefs,%approvalmsg,%rejectionmsg,$crstype);
@approvals = &Apache::loncommon::get_env_multiple('form.approvereq');
@rejections = &Apache::loncommon::get_env_multiple('form.rejectreq');
$now = time;
@@ -355,6 +383,7 @@ sub update_request_queue {
$namespace = 'selfenrollrequests';
$beneficiary = 'enroller';
$cid = $env{'request.course.id'};
+ $crstype = lc(&Apache::loncommon::course_type());
my $chome = &Apache::lonnet::homeserver($cnum,$cdom);
$hostname = &Apache::lonnet::hostname($chome);
$protocol = $Apache::lonnet::protocol{$chome};
@@ -391,16 +420,33 @@ sub update_request_queue {
$notifylist = $domconfig{'requestcourses'}{'notify'}{'approval'};
}
}
- $approvedmsg = [{
+ $approvalmsg{'course'} =
+ [{
mt => 'Your course request has been approved.',
},
{
mt => 'Visit [_1], to log-in and access the course',
args => [$protocol.'://'.$hostname],
}];
- $rejectedmsg = [{
+ $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 => [$protocol.'://'.$hostname],
+ }];
+
+ $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) {
@@ -450,7 +496,7 @@ sub update_request_queue {
$stucounts->{'allstudents'} ++;
$stucounts->{'selfenrolled'} ++;
&send_selfserve_notification($uname.':'.$udom,$approvedmsg,
- $cid,$coursedesc,$now,$beneficiary,$sender);
+ $cid,$coursedesc,$now,$beneficiary,$sender,undef,undef,$crstype);
my %userrequest = (
$cdom.'_'.$cnum => {
timestamp => $now,
@@ -463,15 +509,6 @@ sub update_request_queue {
&Apache::lonnet::put($namespace,\%userrequest,$udom,$uname);
if ($userresult ne 'ok') {
push(@warn_approves,$uname.':'.$udom);
- } elsif ($udom eq 'gci') {
- my %changehash = (
- 'reqcrsotherdom.unofficial' => 'gcitest:autolimit=',
- );
- my $reqresult = &Apache::lonnet::put('environment',\%changehash,
- $udom,$uname);
- if ($reqresult ne 'ok') {
- push(@warn_coursereqs,$uname.':'.$udom);
- }
}
} else {
push(@processing_errors,$uname.':'.$udom);
@@ -486,7 +523,7 @@ sub update_request_queue {
if (&Apache::lonnet::homeserver($cnum,$cdom) eq 'no_host') {
my $ownername = $requesthash{$cnum.'_approval'}{'ownername'};
my $ownerdom = $requesthash{$cnum.'_approval'}{'ownerdom'};
- my $crstype = $requesthash{$cnum.'_approval'}{'crstype'};
+ $crstype = $requesthash{$cnum.'_approval'}{'crstype'};
my $coursedesc = $requesthash{$cnum.'_approval'}{'description'};
my $longroles = \%courseroles;
if ($crstype eq 'community') {
@@ -519,9 +556,14 @@ sub update_request_queue {
\$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);
&send_selfserve_notification($ownername.':'.$ownerdom,$approvedmsg,
- $cid,$coursedesc,$now,$beneficiary,$sender);
+ $cid,$coursedesc,$now,$beneficiary,$sender,undef,undef,$crstype);
my %reqhash = (
reqtime => $history{'reqtime'},
crstype => $history{'crstype'},
@@ -574,7 +616,7 @@ sub update_request_queue {
if ($context eq 'course') {
my $user = $item;
&send_selfserve_notification($user,$rejectedmsg,$cid,$coursedesc,
- $now,$beneficiary,$sender);
+ $now,$beneficiary,$sender,undef,undef,$crstype);
my ($uname,$udom) = split(/:/,$user);
my %userrequest = (
$cdom.'_'.$cnum => {
@@ -596,9 +638,15 @@ sub update_request_queue {
my $ownername = $requesthash{$cnum.'_approval'}{'ownername'};
my $ownerdom = $requesthash{$cnum.'_approval'}{'ownerdom'};
my $coursedesc = $requesthash{$cnum.'_approval'}{'description'};
+ $crstype = $requesthash{$cnum.'_approval'}{'crstype'};
+ if ($crstype eq 'community') {
+ $rejectedmsg = $rejectionmsg{'community'};
+ } else {
+ $rejectedmsg = $rejectionmsg{'course'};
+ }
&send_selfserve_notification($ownername.':'.$ownerdom,$rejectedmsg,
$cid,$coursedesc,$now,$beneficiary,
- $sender);
+ $sender,undef,undef,$crstype);
my %history =
&Apache::lonnet::restore($requestkey,'courserequests',
$ownerdom,$ownername);
@@ -655,7 +703,11 @@ sub update_request_queue {
$chgmsg = "'Action was taken on the following enrollment requests by [_1].',$namelink";
if (@completed) {
$approvedlist = join("\n",@completed);
- $output .= ''.&mt('The following were enrolled in the course:').'
';
+ 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 =
@@ -675,13 +727,13 @@ sub update_request_queue {
if ($notifylist ne '') {
&send_selfserve_notification($notifylist,$chgmsg,$cid,$coursedesc,
$now,'coursemanagers',$sender,
- $approvedlist,$rejectedlist);
+ $approvedlist,$rejectedlist,$crstype);
}
} else {
- $chgmsg = "'Action was taken on the following course requests by [_1].',$namelink";
+ $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 were created:').'
';
+ $output .= ''.&mt('The following courses/communities were created:').'
';
foreach my $cnum (@completed) {
my $showcourse;
if (ref($requesthash{$cnum.'_approval'})) {
@@ -712,7 +764,7 @@ sub update_request_queue {
if ($notifylist ne '') {
&send_selfserve_notification($notifylist,$chgmsg,$cid,$domdesc,
$now,'domainmanagers',$sender,
- $approvedlist,$rejectedlist);
+ $approvedlist,$rejectedlist,$crstype);
}
}
}
@@ -725,7 +777,7 @@ sub update_request_queue {
}
$output .= '
';
} else {
- $output .= ''.&mt('The following course creation requests were deleted because the course has already been created:').'
';
+ $output .= ''.&mt('The following course/community creation requests were deleted because the course or community has already been created:').'
';
foreach my $cnum (@existing) {
my $showcourse;
my %coursehash = &Apache::lonnet::coursedescription($cdom.'/'.$cnum);
@@ -747,7 +799,7 @@ sub update_request_queue {
}
$output .= '
';
} else {
- $output .= ''.&mt('The following course creation requests were ignored because the request is no longer in the course request queue:').'
';
+ $output .= ''.&mt('The following course/community creation requests were ignored because the request is no longer in the queue:').'
';
foreach my $cnum (@missingreq) {
$output .= '- '.$cnum.'
';
}
@@ -774,7 +826,7 @@ sub update_request_queue {
}
}
if (@nopermissions) {
- $output .= ''.&mt('The following course creation requests could not be processed because the course owner does hot have rights to create this type of course:').'
';
+ $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'})) {
@@ -794,7 +846,7 @@ sub update_request_queue {
}
$output .= '
';
} else {
- $output .= ''.&mt('The following course creation requests could not be processed because an error occurred:').'
';
+ $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'})) {
@@ -808,7 +860,7 @@ sub update_request_queue {
}
}
if (@rejectionerrors) {
- $output .= ''.&mt('The following course creation request rejections could not be fully processed because an error occurred:').'
';
+ $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'})) {
@@ -828,7 +880,7 @@ sub update_request_queue {
}
$output .= '
';
} else {
- $output .= ''.&mt("For the following course requests an error occurred when updating the requestor's own course requests record:").'
';
+ $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'})) {
@@ -841,13 +893,6 @@ sub update_request_queue {
$output .= '
';
}
}
- if (@warn_coursereqs) {
- $output .= ''..&mt("For the following users, an error occurred when setting rights to request creation of Concept Test courses:").'
';
- foreach my $user (@warn_coursereqs) {
- $output .= '- '.$user.'
';
- }
- $output .= '
';
- }
return $output;
}
@@ -885,10 +930,6 @@ sub course_creation {
$ownername = $env{'user.name'};
$ownerdom = $env{'user.domain'};
}
- my $type = 'Course';
- if ($crstype eq 'community') {
- $type = 'Community';
- }
my $owneremail;
my %emails = &Apache::loncommon::getemails($ownername,$ownerdom);
foreach my $email ('permanentemail','critnotification','notification') {
@@ -970,11 +1011,15 @@ sub build_batchcreatehash {
}
sub can_clone_course {
- my ($uname,$udom,$clonecrs,$clonedom) = @_;
+ my ($uname,$udom,$clonecrs,$clonedom,$crstype) = @_;
my $canclone;
+ my $ccrole = 'cc';
+ if ($crstype eq 'community') {
+ $ccrole = 'co';
+ }
my %roleshash = &Apache::lonnet::get_my_roles($uname,$udom,'userroles',['active'],
- ['cc'],[$clonedom]);
- if (exists($roleshash{$clonecrs.':'.$clonedom.':cc'})) {
+ [$ccrole],[$clonedom]);
+ if (exists($roleshash{$clonecrs.':'.$clonedom.':'.$ccrole})) {
$canclone = 1;
} else {
my %courseenv = &Apache::lonnet::userenvironment($clonedom,$clonecrs,('cloners'));
@@ -995,4 +1040,95 @@ sub can_clone_course {
return $canclone;
}
+sub get_processtype {
+ my ($uname,$udom,$isadv,$dom,$crstype,$inststatuses,$domconfig) = @_;
+ return unless ((ref($inststatuses) eq 'ARRAY') && (ref($domconfig) eq 'HASH'));
+ if ($uname eq '' || $udom eq '') {
+ $uname = $env{'user.name'};
+ $udom = $env{'user.domain'};
+ $isadv = $env{'user.adv'};
+ }
+ my (%userenv,%settings,$val);
+ my @options = ('autolimit','validate','approval');
+ if ($dom eq $udom) {
+ %userenv =
+ &Apache::lonnet::userenvironment($udom,$uname,'requestcourses.'.$crstype,'inststatus');
+ if ($userenv{'requestcourses.'.$crstype}) {
+ $val = $userenv{'requestcourses.'.$crstype};
+ @{$inststatuses} = ('_custom_');
+ } else {
+ my ($task,%alltasks);
+ if (ref($domconfig->{'requestcourses'}) eq 'HASH') {
+ %settings = %{$domconfig->{'requestcourses'}};
+ if (ref($settings{$crstype}) eq 'HASH') {
+ if (($isadv) && ($settings{$crstype}{'_LC_adv'} ne '')) {
+ $val = $settings{$crstype}{'_LC_adv'};
+ @{$inststatuses} = ('_LC_adv_');
+ } else {
+ if ($userenv{'inststatus'} ne '') {
+ @{$inststatuses} = split(',',$userenv{'inststatus'});
+ } else {
+ @{$inststatuses} = ('default');
+ }
+ foreach my $status (@{$inststatuses}) {
+ if (exists($settings{$crstype}{$status})) {
+ my $value = $settings{$crstype}{$status};
+ next unless ($value);
+ unless (exists($alltasks{$value})) {
+ if (ref($alltasks{$value}) eq 'ARRAY') {
+ unless(grep(/^\Q$status\E$/,@{$alltasks{$value}})) {
+ push(@{$alltasks{$value}},$status);
+ }
+ } else {
+ @{$alltasks{$value}} = ($status);
+ }
+ }
+ }
+ }
+ my $maxlimit = 0;
+
+ foreach my $key (sort(keys(%alltasks))) {
+ if ($key =~ /^autolimit=(\d*)$/) {
+ if ($1 eq '') {
+ $val ='autolimit=';
+ last;
+ } elsif ($1 > $maxlimit) {
+ $maxlimit = $1;
+ }
+ }
+ }
+ if ($maxlimit) {
+ $val = 'autolimit='.$maxlimit;
+ } else {
+ foreach my $option (@options) {
+ if ($alltasks{$option}) {
+ $val = $option;
+ last;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ } else {
+ %userenv = &Apache::lonnet::userenvironment($udom,$uname,'reqcrsotherdom.'.$crstype);
+ if ($userenv{'reqcrsotherdom.'.$crstype}) {
+ my @doms = split(',',$userenv{'reqcrsotherdom.'.$crstype});
+ my $optregex = join('|',@options);
+ foreach my $item (@doms) {
+ my ($extdom,$extopt) = split(':',$item);
+ if ($extdom eq $dom) {
+ if ($extopt =~ /^($optregex)(=?\d*)$/) {
+ $val = $1.$2;
+ }
+ last;
+ }
+ }
+ @{$inststatuses} = ('_external_');
+ }
+ }
+ return $val;
+}
+
1;