--- loncom/interface/loncoursequeueadmin.pm 2009/12/07 02:04:25 1.12.2.1
+++ loncom/interface/loncoursequeueadmin.pm 2010/12/08 03:49:34 1.12.2.12
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Utilities to administer domain course requests and course self-enroll requests
#
-# $Id: loncoursequeueadmin.pm,v 1.12.2.1 2009/12/07 02:04:25 raeburn Exp $
+# $Id: loncoursequeueadmin.pm,v 1.12.2.12 2010/12/08 03:49:34 raeburn 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,14 @@ described at http://www.lon-capa.org.
=item get_student_counts()
+=item course_creation()
+
+=item build_batchcreatehash()
+
+=item can_clone_course()
+
+=item queued_selfenrollment()
+
=back
=cut
@@ -57,7 +67,6 @@ 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;
@@ -367,7 +376,7 @@ sub update_request_queue {
@processing_errors,@warn_approves,@warn_rejects,@approvals,
@rejections,@rejectionerrors,@nopermissions,%courseroles,
%communityroles,%domdefs,%approvalmsg,%rejectionmsg,$crstype,
- @warn_coursereqs);
+ @warn_coursereqs,$firsturl);
@approvals = &Apache::loncommon::get_env_multiple('form.approvereq');
@rejections = &Apache::loncommon::get_env_multiple('form.rejectreq');
$now = time;
@@ -381,6 +390,12 @@ sub update_request_queue {
$hostname = &Apache::lonnet::hostname($chome);
$protocol = $Apache::lonnet::protocol{$chome};
$protocol = 'http' if ($protocol ne 'https');
+ my %domdefaults = &Apache::lonnet::get_domain_defaults($cdom);
+ if ($domdefaults{'portal_def'}) {
+ $firsturl = $domdefaults{'portal_def'};
+ } else {
+ $firsturl = $protocol.'://'.$hostname;
+ }
%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'};
@@ -393,7 +408,7 @@ sub update_request_queue {
},
{
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.',
@@ -407,6 +422,12 @@ sub update_request_queue {
$hostname = &Apache::lonnet::hostname($chome);
$protocol = $Apache::lonnet::protocol{$chome};
$protocol = 'http' if ($protocol ne 'https');
+ my %domdefaults = &Apache::lonnet::get_domain_defaults($cdom);
+ if ($domdefaults{'portal_def'}) {
+ $firsturl = $domdefaults{'portal_def'};
+ } else {
+ $firsturl = $protocol.'://'.$hostname;
+ }
my %domconfig = &Apache::lonnet::get_dom('configuration',['requestcourses'],$cdom);
if (ref($domconfig{'requestcourses'}) eq 'HASH') {
if (ref($domconfig{'requestcourses'}{'notify'}) eq 'HASH') {
@@ -419,7 +440,7 @@ sub update_request_queue {
},
{
mt => 'Visit [_1], to log-in and access the course',
- args => [$protocol.'://'.$hostname],
+ args => [$firsturl],
}];
$rejectionmsg{'course'} =
[{
@@ -432,7 +453,7 @@ sub update_request_queue {
},
{
mt => 'Visit [_1], to log-in and access the community',
- args => [$protocol.'://'.$hostname],
+ args => [$firsturl],
}];
$rejectionmsg{'community'} =
@@ -450,13 +471,30 @@ sub update_request_queue {
}
}
+ my %allnums = &Apache::loncommon::get_faculty_cnums();
foreach my $item (sort {$a <=> $b} @approvals) {
if ($context eq 'course') {
my ($num,$uname,$udom,$usec) = split(/:/,$item);
my $uhome = &Apache::lonnet::homeserver($uname,$udom);
if ($uhome ne 'no_host') {
if (exists($requesthash{$uname.':'.$udom})) {
-
+ if (($cdom ne '') && (ref($allnums{$cdom}) eq 'HASH')) {
+ my ($addothers,@others);
+ foreach my $key (%{$allnums{$cdom}}) {
+ if ($key eq $cnum) {
+ $addothers = 1;
+ } else {
+ push(@others,$key);
+ }
+ }
+ if ($addothers) {
+ foreach my $crs (@others) {
+ my $enresult =
+ &enable_additional_roles($cdom,$crs,$udom,$uname,
+ $access_end,$access_start);
+ }
+ }
+ }
if (exists($classlist->{$uname.':'.$udom})) {
if (ref($classlist->{$uname.':'.$udom}) eq 'ARRAY') {
if (($classlist->{$uname.':'.$udom}->[$idx->{'status'}] eq 'Active') ||
@@ -502,9 +540,9 @@ sub update_request_queue {
&Apache::lonnet::put($namespace,\%userrequest,$udom,$uname);
if ($userresult ne 'ok') {
push(@warn_approves,$uname.':'.$udom);
- } elsif ($udom eq 'gci') {
+ } elsif (ref($allnums{$udom}) eq 'HASH') {
my %changehash = (
- 'reqcrsotherdom.unofficial' => 'gcitest:autolimit=',
+ 'reqcrsotherdom.unofficial' => $udom.'test:autolimit=',
);
my $reqresult = &Apache::lonnet::put('environment',\%changehash,
$udom,$uname);
@@ -905,6 +943,21 @@ sub update_request_queue {
return $output;
}
+sub enable_additional_roles {
+ my ($cdom,$cnum,$udom,$uname,$access_end,$access_start) = @_;
+ my ($stucounts,$idx,$classlist) = &get_student_counts($cdom,$cnum);
+ if (exists($classlist->{$uname.':'.$udom})) {
+ if (ref($classlist->{$uname.':'.$udom}) eq 'ARRAY') {
+ if (($classlist->{$uname.':'.$udom}->[$idx->{'status'}] eq 'Active') ||
+ ($classlist->{$uname.':'.$udom}->[$idx->{'status'}] eq 'Future')) {
+ return;
+ }
+ }
+ }
+ return
+ &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,undef,$access_end,$access_start,'selfenroll',undef,$cdom.'_'.$cnum,1);
+}
+
sub get_student_counts {
my ($cdom,$cnum) = @_;
my (%idx,%stucounts);
@@ -947,8 +1000,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 {
@@ -960,9 +1013,12 @@ sub course_creation {
sub build_batchcreatehash {
my ($dom,$context,$details,$owneremail,$domdefs) = @_;
my %batchhash;
- my @items = qw{owner domain coursehome clonecrs clonedom datemode dateshift enrollstart enrollend accessstart accessend sections crosslists users};
+ my @items = qw{owner domain coursehome clonecrs clonedom cloneroster datemode dateshift enrollstart enrollend accessstart accessend sections crosslists users};
+ if ($dom =~ /^\w+citest$/) {
+ push(@items,'firstres');
+ }
if ((ref($details) eq 'HASH') && (ref($domdefs) eq 'HASH')) {
- my $emailenc = &Apache::lonnet::escape($owneremail);
+ my $emailenc = &escape($owneremail);
my $owner = $details->{'owner'}.':'.$details->{'domain'};
foreach my $item (@items) {
$batchhash{$item} = $details->{$item};
@@ -1045,8 +1101,59 @@ sub can_clone_course {
$canclone = 1;
}
}
+ unless ($canclone) {
+ if (&Apache::lonnet::is_course_owner($clonedom,$clonecrs,$uname,$udom)) {
+ $canclone = 1;
+ }
+ }
}
return $canclone;
}
+sub queued_selfenrollment {
+ my ($notitle) = @_;
+ my $output;
+ my %selfenrollrequests = &Apache::lonnet::dump('selfenrollrequests');
+ my %reqs_by_date;
+ foreach my $item (keys(%selfenrollrequests)) {
+ if (ref($selfenrollrequests{$item}) eq 'HASH') {
+ if ($selfenrollrequests{$item}{'status'} eq 'request') {
+ if ($selfenrollrequests{$item}{'timestamp'}) {
+ push(@{$reqs_by_date{$selfenrollrequests{$item}{'timestamp'}}},$item);
+ }
+ }
+ }
+ }
+ if (keys(%reqs_by_date)) {
+ unless ($notitle) {
+ $output .= ''.&mt('Enrollment requests pending Course Coordinator approval').'
';
+ }
+ $output .= &Apache::loncommon::start_data_table().
+ &Apache::loncommon::start_data_table_header_row().
+ '