--- loncom/interface/loncoursequeueadmin.pm 2009/12/20 02:05:57 1.12.2.3 +++ loncom/interface/loncoursequeueadmin.pm 2010/12/07 04:19:59 1.12.2.11 @@ -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.3 2009/12/20 02:05:57 raeburn Exp $ +# $Id: loncoursequeueadmin.pm,v 1.12.2.11 2010/12/07 04:19:59 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; @@ -450,15 +459,29 @@ 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 eq 'gci' && $cnum eq '9615072b469884921gcil1') { - my $enresult = &enable_gci_submission($uname,$udom, - $access_start,$access_end); + 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') { @@ -505,9 +528,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); @@ -908,10 +931,8 @@ sub update_request_queue { return $output; } -sub enable_gci_submission { - my ($udom,$uname,$access_end,$access_start) = @_; - my $cdom = 'gci'; - my $cnum = '1H96711d710194bfegcil1'; +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') { @@ -967,8 +988,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 { @@ -980,12 +1001,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}; - if ($dom eq 'gcitest') { + 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}; @@ -1068,8 +1089,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(). + ''.&mt('Date requested').''.&mt('Course title').''. + ''.&mt('User role').''.&mt('Section').''. + &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; +} + 1;