--- loncom/interface/loncoursequeueadmin.pm 2009/11/04 17:42:17 1.11 +++ loncom/interface/loncoursequeueadmin.pm 2010/02/26 23:39:01 1.12.2.8 @@ -1,7 +1,7 @@ # The LearningOnline Network # Utilities to administer domain course requests and course self-enroll requests # -# $Id: loncoursequeueadmin.pm,v 1.11 2009/11/04 17:42:17 raeburn Exp $ +# $Id: loncoursequeueadmin.pm,v 1.12.2.8 2010/02/26 23:39:01 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; @@ -67,12 +76,12 @@ 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,{ @@ -80,9 +89,9 @@ sub send_selfserve_notification { 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 +99,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 +113,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 +129,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; @@ -235,12 +264,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 +361,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 +375,8 @@ sub update_request_queue { @existing,@missingreq,@invalidusers,@limitexceeded,@completed, @processing_errors,@warn_approves,@warn_rejects,@approvals, @rejections,@rejectionerrors,@nopermissions,%courseroles, - %communityroles,%domdefs); + %communityroles,%domdefs,%approvalmsg,%rejectionmsg,$crstype, + @warn_coursereqs); @approvals = &Apache::loncommon::get_env_multiple('form.approvereq'); @rejections = &Apache::loncommon::get_env_multiple('form.rejectreq'); $now = time; @@ -355,6 +385,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 +422,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) { @@ -417,7 +465,10 @@ sub update_request_queue { 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($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') || @@ -450,7 +501,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,6 +514,15 @@ 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); @@ -477,7 +537,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') { @@ -510,9 +570,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'}, @@ -565,7 +630,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 => { @@ -587,9 +652,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); @@ -646,7 +717,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:').'