--- loncom/interface/loncoursequeueadmin.pm 2009/08/16 23:04:42 1.3
+++ loncom/interface/loncoursequeueadmin.pm 2010/02/22 09:47:56 1.20
@@ -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.3 2009/08/16 23:04:42 raeburn Exp $
+# $Id: loncoursequeueadmin.pm,v 1.20 2010/02/22 09:47:56 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -33,7 +33,9 @@ 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.
@@ -50,6 +52,16 @@ described at http://www.lon-capa.org.
=item get_student_counts()
+=item course_creation()
+
+=item build_batchcreatehash()
+
+=item can_clone_course()
+
+=item get_processtype()
+
+=item queued_selfenrollment()
+
=back
=cut
@@ -57,32 +69,31 @@ 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 Apache::lonuserutils;
-use LONCAPA;
+use LONCAPA qw(:DEFAULT :match);
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 +101,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 +115,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 +131,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 +219,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;
}
@@ -220,7 +251,7 @@ sub display_queued_requests {
} else {
$formaction = '/adm/createcourse';
$namespace = 'courserequestqueue';
- %requesthash = &Apache::lonnet::dump_dom($namespace,$dom,undef,'_approval');
+ %requesthash = &Apache::lonnet::dump_dom($namespace,$dom,'_approval');
$nextelement = '';
}
my ($output,%queue_by_date,%crstypes);
@@ -235,12 +266,12 @@ sub display_queued_requests {
if ($context eq 'course') {
$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 =
@@ -651,13 +736,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'})) {
@@ -688,7 +773,7 @@ sub update_request_queue {
if ($notifylist ne '') {
&send_selfserve_notification($notifylist,$chgmsg,$cid,$domdesc,
$now,'domainmanagers',$sender,
- $approvedlist,$rejectedlist);
+ $approvedlist,$rejectedlist,$crstype);
}
}
}
@@ -701,7 +786,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);
@@ -723,7 +808,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:').'
'.&mt('The following course/community creation requests could not be processed because the owner does not have rights to create this type of course:').'