[LON-CAPA-cvs] cvs: loncom /interface loncoursequeueadmin.pm lonrequestcourse.pm
raeburn
raeburn@source.lon-capa.org
Sun, 16 Aug 2009 19:16:16 -0000
This is a MIME encoded message
--raeburn1250450176
Content-Type: text/plain
raeburn Sun Aug 16 19:16:16 2009 EDT
Modified files:
/loncom/interface loncoursequeueadmin.pm lonrequestcourse.pm
Log:
Course Requests
- Move &build_batchcreatehash() from lonrequestcourse.pm to loncoursequeueadmin.pm
- Move call to LONCAPA::batchcreatecourse into a separate routine: &course_creation()
within loncoursequeueadmin.pm
- Code added for resolution of course requests subject to approval by DC.
- either approve and create course, or reject.
- formatting of LON-CAPA messages sent to notification list and requestor improved.
- Change in storage of status information for a request.
- Status now stored in a separate key => value in courserequests.db file belonging to requestor
- key is status:$cdom:$cnum
- User's display of pending requests now shows the required information.
(Select button to view/modify/cancel individual request currently inactive - work in progress).
--raeburn1250450176
Content-Type: text/plain
Content-Disposition: attachment; filename="raeburn-20090816191616.txt"
Index: loncom/interface/loncoursequeueadmin.pm
diff -u loncom/interface/loncoursequeueadmin.pm:1.1 loncom/interface/loncoursequeueadmin.pm:1.2
--- loncom/interface/loncoursequeueadmin.pm:1.1 Tue Aug 11 00:39:45 2009
+++ loncom/interface/loncoursequeueadmin.pm Sun Aug 16 19:16:16 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Utilities to administer domain course requests and course self-enroll requests
#
-# $Id: loncoursequeueadmin.pm,v 1.1 2009/08/11 00:39:45 raeburn Exp $
+# $Id: loncoursequeueadmin.pm,v 1.2 2009/08/16 19:16:16 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -62,30 +62,28 @@
use Apache::loncommon;
use Apache::lonmsg;
use Apache::lonlocal;
+use Apache::lonuserutils;
use LONCAPA;
sub send_selfserve_notification {
- my ($notifylist,$textstr,$cid,$coursedesc,$timestamp,$context,$sender,
+ my ($notifylist,$textstr,$cid,$contextdesc,$timestamp,$context,$sender,
$approvedlist,$rejectedlist) = @_;
# 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,$namelink);
- $namelink = &Apache::loncommon::aboutmewrapper(
- &Apache::loncommon::plainname($env{'user.name'},$env{'user.domain'}));
+ my ($rawsubj,@rawmsg,$subject,$message,$reviewer);
if ($context eq 'coursemanagers') {
$rawsubj = 'Self-enrollment requests processed';
push(@rawmsg,{
- mt => 'Enrollment requests in the following course: [_1] have been processed.',
- args => ["\n$coursedesc\n"],
+ mt => 'Enrollment requests in the following course: [_1]have been processed.',
+ args => ["\n $contextdesc\n"],
});
} elsif ($context eq 'domainmanagers') {
- $rawsubj = 'Course request';
+ $rawsubj = 'Course requests reviewed';
push(@rawmsg,{
- mt => 'Your request for creation of the following course: [_1], requested on [_2], has been reviewed by a Domain Coordinator.',
- args => ["\n$coursedesc\n","$timestamp\n"],
-
+ mt => 'Course creation requests in the following domain: [_1]have been reviewed.',
+ args => ["\n $contextdesc\n"],
});
if (ref($textstr) eq 'ARRAY') {
push(@rawmsg,@{$textstr});
@@ -93,8 +91,8 @@
} elsif ($context eq 'enroller') {
$rawsubj = 'Enrollment request';
push(@rawmsg,{
- mt => 'Your request for enrollment in the following course: [_1], requested on [_2], has been reviewed by a Course Coordinator.',
- args => ["\n$coursedesc\n","$timestamp\n"],
+ mt => 'Your request for enrollment in the following course: [_1]requested on [_2]has been reviewed by a Course Coordinator.',
+ args => ["\n ".$contextdesc.",\n",$timestamp.",\n"],
});
if (ref($textstr) eq 'ARRAY') {
@@ -103,32 +101,43 @@
} elsif ($context eq 'courserequestor') {
$rawsubj = 'Course request';
push(@rawmsg,{
- mt => 'Your request for creation of the following course: [_1], requested on [_2], has been reviewed by a Domain Coordinator.',
- args => ["\n$coursedesc\n","$timestamp\n"],
+ mt => 'Your request for creation of the following course: [_1]requested on [_2]has been reviewed by a Domain Coordinator.',
+ args => ["\n".$contextdesc.",\n",$timestamp.",\n"],
});
if (ref($textstr) eq 'ARRAY') {
push(@rawmsg,@{$textstr});
}
} elsif ($context eq 'coursereq') {
+ $rawsubj = 'Course request to review',
push(@rawmsg,{
- mt => 'Creation of the following course: [_1] was requested by [_2] on [_3].',
- args => ["\n$coursedesc\n",$textstr,$timestamp],
+ mt => 'Creation of the following course: [_1]was requested by [_2] on [_3].',
+ args => ["\n $contextdesc\n",$textstr,$timestamp],
},
{
- mt =>'As Domain Coordinator, use: [_1]Main Menu -> Create a new course -> Manage Course Requests[_1] to display a list of pending course requests,[_1] which you can either approve or reject.',
- args => ["\n"],
+ 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.',
+ args => ["\n","\n\n ","\n\n"],
});
} elsif ($context eq 'selfenrollreq') {
$rawsubj = 'Self-enrollment request';
push(@rawmsg,{
mt => 'Enrollment in the following course: [_1] was requested by [_2] on [_3].',
- args => ["\n$coursedesc\n",$textstr,$timestamp],
- },
+ 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"],
+ });
+ } else {
+ push(@rawmsg,
{
- mt =>'As Course Coordinator, use: [_1]Main Menu -> Manage Course Users -> Enrollment Requests[_1] to display a list of pending enrollment requests,[_1] which you can either approve or reject.',
- args => ["\n"],
+ 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.',
+ args => [" \n\n","\n"],
});
+
+ }
}
my @to_notify = split(/,/,$notifylist);
my $numsent = 0;
@@ -149,7 +158,7 @@
my ($uname,$udom);
if ($sender =~ /:/) {
($uname,$udom) = split(/:/,$sender);
- } else {
+ } elsif ($context eq 'course') {
$uname = $sender;
my %courseinfo = &Apache::lonnet::coursedescription($cid);
$udom = $courseinfo{'num'};
@@ -202,21 +211,23 @@
sub display_queued_requests {
my ($context,$dom,$cnum) = @_;
- my ($namespace,$formaction,%requesthash);
+ my ($namespace,$formaction,$nextelement,%requesthash);
if ($context eq 'course') {
$formaction = '/adm/createuser';
$namespace = 'selfenrollrequests';
%requesthash = &Apache::lonnet::dump($namespace,$dom,$cnum);
+ $nextelement = '<input type="hidden" name="state" value="done" />';
} else {
$formaction = '/adm/createcourse';
$namespace = 'courserequestqueue';
%requesthash = &Apache::lonnet::dump_dom($namespace,$dom,undef,'_approval');
+ $nextelement = '<input type="hidden" name="phase" value="requestchange" />';
}
my ($output,%queue_by_date,%crstypes);
if (keys(%requesthash) > 0) {
- $output = '<form method="post" name="changequeue" action="'.$formaction.'" />'.
- '<input type="hidden" name="action" value="'.$env{'form.action'}.'" />'.
- '<input type="hidden" name="state" value="done" />'.
+ $output = '<form method="post" name="changequeue" action="'.$formaction.'" />'."\n".
+ '<input type="hidden" name="action" value="'.$env{'form.action'}.'" />'."\n".
+ $nextelement."\n".
&Apache::loncommon::start_data_table().
&Apache::loncommon::start_data_table_header_row().
'<th>'.&mt('Action').'</th>'.
@@ -243,7 +254,8 @@
} else {
$timestamp = $requesthash{$item}{'timestamp'};
if (ref($requesthash{$item}) eq 'HASH') {
- $entry = $item.':'.$requesthash{$item}{'ownername'}.':'.
+ my ($cnum,$disposition) = split('_',$item);
+ $entry = $cnum.':'.$requesthash{$item}{'ownername'}.':'.
$requesthash{$item}{'ownerdom'}.':'.
$requesthash{$item}{'crstype'}.':'.
$requesthash{$item}{'description'};
@@ -280,7 +292,7 @@
$puname,$pudom);
} else {
- my ($cnum,$ownername,$ownerdom,$type,$cdesc)=split(/:/,$request);
+ my ($cnum,$ownername,$ownerdom,$type,$cdesc)=split(/:/,$request,5);
$detailslink='<a href="javascript::opencoursereqdisplay('.
"'$dom".'_'."$cnum'".');">'.$cdesc.'</a>';
$crstype = $type;
@@ -329,11 +341,11 @@
sub update_request_queue {
my ($context,$cdom,$cnum,$coursedesc) = @_;
my ($output,$access_start,$access_end,$limit,$cap,$notifylist,$namespace,
- $stucounts,$idx,$classlist,%requesthash,$coursedesc,$cid,$hostname,
- $protocol,$now,$sender,$approvedmsg,$rejectedmsg,$beneficiary,
- @existing,@missingreq,@invalidusers,@limitexceeded,@enrolled,@created,
- @enrollerrors,@create_errors,@warn_approves,@warn_rejects,@approvals,
- @rejections);
+ $stucounts,$idx,$classlist,%requesthash,$cid,$hostname,$protocol,
+ $domdesc,$now,$sender,$approvedmsg,$rejectedmsg,$beneficiary,
+ @existing,@missingreq,@invalidusers,@limitexceeded,@completed,
+ @processing_errors,@warn_approves,@warn_rejects,@approvals,
+ @rejections,%courseroles,%communityroles,%domdefs);
@approvals = &Apache::loncommon::get_env_multiple('form.approvereq');
@rejections = &Apache::loncommon::get_env_multiple('form.rejectreq');
$now = time;
@@ -352,7 +364,6 @@
$limit = $env{'course.'.$cid.'.internal.selfenroll_limit'};
$cap = $env{'course.'.$cid.'.internal.selfenroll_cap'};
$notifylist = $env{'course.'.$cid.'.internal.selfenroll_notifylist'};
- $namespace = 'selfenrollrequests';
($stucounts,$idx,$classlist) = &get_student_counts($cdom,$cnum);
$approvedmsg = [{
mt => 'Your request for enrollment has been approved.',
@@ -365,7 +376,39 @@
mt => 'Your request for enrollment has not been approved.',
}];
} else {
- $beneficiary = 'requestor';
+ $domdesc = &Apache::lonnet::domain($cdom);
+ $namespace = 'courserequestqueue';
+ $beneficiary = 'courserequestor';
+ %requesthash = &Apache::lonnet::dump_dom($namespace,$cdom,undef,'_approval');
+ my $chome = &Apache::lonnet::domain($cdom,'primary');
+ $hostname = &Apache::lonnet::hostname($chome);
+ $protocol = $Apache::lonnet::protocol{$chome};
+ $protocol = 'http' if ($protocol ne 'https');
+ my %domconfig = &Apache::lonnet::get_dom('configuration',['requestcourses'],$cdom);
+ if (ref($domconfig{'requestcourses'}) eq 'HASH') {
+ if (ref($domconfig{'requestcourses'}{'notify'}) eq 'HASH') {
+ $notifylist = $domconfig{'requestcourses'}{'notify'}{'approval'};
+ }
+ }
+ $approvedmsg = [{
+ mt => 'Your course request has been approved.',
+ },
+ {
+ mt => 'Visit [_1], to log-in and access the course',
+ args => [$protocol.'://'.$hostname],
+ }];
+ $rejectedmsg = [{
+ mt => 'Your course request has not been approved.',
+ }];
+ %domdefs = &Apache::lonnet::get_domain_defaults($cdom);
+ my @roles = &Apache::lonuserutils::roles_by_context('course');
+ foreach my $role (@roles) {
+ $courseroles{$role}=&Apache::lonnet::plaintext($role,'Course');
+ }
+ foreach my $role (@roles) {
+ $communityroles{$role}=&Apache::lonnet::plaintext($role,'Community');
+ }
+
}
foreach my $item (sort {$a <=> $b} @approvals) {
if ($context eq 'course') {
@@ -402,46 +445,111 @@
my $result =
&Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$usec,$access_end,$access_start,'selfenroll',undef,$cdom.'_'.$cnum,1);
if ($result eq 'ok') {
- push(@enrolled,$uname.':'.$udom);
+ push(@completed,$uname.':'.$udom);
$stucounts->{'allstudents'} ++;
$stucounts->{'selfenrolled'} ++;
&send_selfserve_notification($uname.':'.$udom,$approvedmsg,
$cid,$coursedesc,$now,$beneficiary,$sender);
- my %userrequest;
- if ($context eq 'course') {
- %userrequest = (
- $cdom.'_'.$cnum => {
- timestamp => $now,
- section => $usec,
- adjudicator => $env{'user.name'}.':'.$env{'user.domain'},
- status => 'approved',
- }
- );
- } else {
- %userrequest = ();
- }
+ my %userrequest = (
+ $cdom.'_'.$cnum => {
+ timestamp => $now,
+ section => $usec,
+ adjudicator => $env{'user.name'}.':'.$env{'user.domain'},
+ status => 'approved',
+ }
+ );
my $userresult =
&Apache::lonnet::put($namespace,\%userrequest,$udom,$uname);
if ($userresult ne 'ok') {
push(@warn_approves,$uname.':'.$udom);
}
} else {
- push(@enrollerrors,$uname.':'.$udom);
+ push(@processing_errors,$uname.':'.$udom);
}
}
} else {
push(@invalidusers,$uname.':'.$udom);
}
} else {
-
+ my ($num,$cnum) = split(':',$item);
+ if (ref($requesthash{$cnum.'_approval'}) eq 'HASH') {
+ 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'};
+ my $coursedesc = $requesthash{$cnum.'_approval'}{'description'};
+ my $longroles = \%courseroles;
+ if ($crstype eq 'community') {
+ $longroles = \%communityroles;
+ }
+ if (&Apache::lonnet::usertools_access($ownername,$ownerdom,$crstype,
+ undef,'requestcourses')) {
+ my $requestkey = $cdom.'_'.$cnum;
+ my %history =
+ &Apache::lonnet::restore($requestkey,'courserequests',
+ $ownerdom,$ownername);
+ if ((ref($history{'details'}) eq 'HASH') &&
+ ($history{'disposition'} eq 'approval')) {
+ my ($logmsg,$newusermsg,$addresult,$enrollcount,$response,$keysmsg);
+ my $result = &course_creation($cdom,$cnum,$context,$history{'details'},\$logmsg,
+ \$newusermsg,\$addresult,\$enrollcount,
+ \$response,\$keysmsg,\%domdefs,$longroles);
+ if ($result eq 'created') {
+ push(@completed,$cnum);
+ &send_selfserve_notification($ownername.':'.$ownerdom,$approvedmsg,
+ $cid,$coursedesc,$now,$beneficiary,$sender);
+ my %reqhash = (
+ reqtime => $history{'reqtime'},
+ crstype => $history{'crstype'},
+ details => $history{'details'},
+ disposition => $history{'disposition'},
+ status => 'created',
+ adjudicator => $env{'user.name'}.':'.
+ $env{'user.domain'},
+ );
+ my $userresult =
+ &Apache::lonnet::store_userdata(\%reqhash,$requestkey,
+ 'courserequests',$ownerdom,$ownername);
+ if ($userresult eq 'ok') {
+ my %status = (
+ 'status:'.$cdom.':'.$cnum => 'created'
+ );
+ my $statusresult =
+ &Apache::lonnet::put('courserequests',\%status,
+ $ownerdom,$ownername);
+ if ($statusresult ne 'ok') {
+ push(@warn_approves,$cnum);
+ }
+ }
+ if ($userresult ne 'ok') {
+ push(@warn_approves,$cnum);
+ }
+ } else {
+ push(@processing_errors,$cnum);
+ }
+ } else {
+ push(@processing_errors,$cnum);
+ }
+ } else {
+ push(@processing_errors,$cnum);
+ }
+ } else {
+ push(@existing,$cnum);
+ }
+ } else {
+ push(@missingreq,$cnum);
+ }
}
}
- my @changes = (@enrolled,@rejections);
+ my @changes = (@completed,@rejections);
+ if ($context eq 'domain') {
+ @changes = map {$_.'_approval'} (@changes);
+ }
if (@rejections) {
foreach my $user (@rejections) {
- &send_selfserve_notification($user,$rejectedmsg,$cid,$coursedesc,
- $now,$beneficiary,$sender);
if ($context eq 'course') {
+ &send_selfserve_notification($user,$rejectedmsg,$cid,$coursedesc,
+ $now,$beneficiary,$sender);
my ($uname,$udom) = split(/:/,$user);
my %userrequest = (
$cdom.'_'.$cnum => {
@@ -456,7 +564,35 @@
push(@warn_rejects,$user);
}
} else {
-
+ if (ref($requesthash{$user.'_approval'}) eq 'HASH') {
+ if (&Apache::lonnet::homeserver($user,$cdom) eq 'no_host') {
+ my $ownername = $requesthash{$cnum.'_approval'}{'ownername'};
+ my $ownerdom = $requesthash{$cnum.'_approval'}{'ownerdom'};
+ my $coursedesc = $requesthash{$cnum.'_approval'}{'description'};
+ &send_selfserve_notification($ownername.':'.$ownerdom,$rejectedmsg,
+ $cid,$coursedesc,$now,$beneficiary,
+ $sender);
+ my %history =
+ &Apache::lonnet::restore($cdom.'_'.$cnum,'courserequests',
+ $ownerdom,$ownername);
+ if ((ref($history{'details'}) eq 'HASH') &&
+ ($history{'disposition'} eq 'approval')) {
+ my %reqhash = (
+ reqtime => $history{'reqtime'},
+ crstype => $history{'crstype'},
+ details => $history{'details'},
+ disposition => $history{'disposition'},
+ status => 'rejected',
+ adjudicator => $env{'user.name'}.':'.$env{'user.domain'},
+ );
+ my $userresult =
+ &Apache::lonnet::store_userdata($namespace,\%reqhash,$ownerdom,$ownername);
+ if ($userresult ne 'ok') {
+ push(@warn_rejects,$user);
+ }
+ }
+ }
+ }
}
}
}
@@ -473,10 +609,10 @@
my ($chgmsg,$approvedlist,$rejectedlist);
if ($context eq 'course') {
$chgmsg = "'Action was taken on the following enrollment requests by [_1].',$namelink";
- if (@enrolled) {
- $approvedlist = join("\n",@enrolled);
+ if (@completed) {
+ $approvedlist = join("\n",@completed);
$output .= '<p>'.&mt('The following were enrolled in the course:').'<ul>';
- foreach my $user (@enrolled) {
+ foreach my $user (@completed) {
my ($uname,$udom) = split(/:/,$user);
my $userlink =
&Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$udom),$uname,$udom);
@@ -492,13 +628,49 @@
}
$output .= '</ul></p>';
}
+ if ($notifylist ne '') {
+ &send_selfserve_notification($notifylist,$chgmsg,$cid,$coursedesc,
+ $now,'coursemanagers',$sender,
+ $approvedlist,$rejectedlist);
+ }
} else {
-
-
+ $chgmsg = "'Action was taken on the following course requests by [_1].',$namelink";
+ if (@completed) {
+ $approvedlist = join("\n",@completed);
+ $output .= '<p>'.&mt('The following courses were created:').'<ul>';
+ foreach my $cnum (@completed) {
+ my $showcourse;
+ if (ref($requesthash{$cnum.'_approval'})) {
+ $showcourse = $requesthash{$cnum.'_approval'}{'description'};
+ } else {
+ $showcourse = $cnum;
+ }
+ my $syllabuslink =
+ &Apache::loncommon::syllabuswrapper($showcourse,$cnum,$cdom);
+ $output .= '<li>'.$syllabuslink.'</li>';
+ }
+ $output .= '</ul></p>';
+ }
+ if (@rejections) {
+ $rejectedlist = join("\n",@rejections);
+ $output .= '<p>'.&mt('The following requests were rejected:').'<ul>';
+ foreach my $cnum (@rejections) {
+ my $showcourse;
+ if (ref($requesthash{$cnum.'_approval'})) {
+ $showcourse = $requesthash{$cnum.'_approval'}{'description'};
+ } else {
+ $showcourse = $cnum;
+ }
+ $output .= '<li>'.$showcourse.'</li>';
+ }
+ $output .= '</ul></p>';
+ }
+ if ($notifylist ne '') {
+ &send_selfserve_notification($notifylist,$chgmsg,$cid,$domdesc,
+ $now,'domainmanagers',$sender,
+ $approvedlist,$rejectedlist);
+ }
}
- &send_selfserve_notification($notifylist,$chgmsg,$cid,$coursedesc,
- $now,'coursemanagers',$sender,
- $approvedlist,$rejectedlist);
}
}
if (@existing) {
@@ -509,7 +681,18 @@
}
$output .= '</ul></p>';
} else {
-
+ $output .= '<p>'.&mt('The following course creation requests were deleted because the course has already been created:').'<ul>';
+ foreach my $cnum (@existing) {
+ my $showcourse;
+ my %coursehash = &Apache::lonnet::coursedescription($cdom.'/'.$cnum);
+ if ($coursehash{'description'} ne '') {
+ $showcourse = $coursehash{'description'};
+ } else {
+ $showcourse = $cnum;
+ }
+ $output .= '<li>'.$showcourse.'</li>';
+ }
+ $output .= '</ul></p>';
}
}
if (@missingreq) {
@@ -519,6 +702,13 @@
$output .= '<li>'.$user.'</li>';
}
$output .= '</ul></p>';
+ } else {
+ $output .= '<p>'.&mt('The following course creation requests were ignored because the request is no longer in the course request queue:').'<ul>';
+ foreach my $cnum (@missingreq) {
+ $output .= '<li>'.$cnum.'</li>';
+ }
+ $output .= '</ul></p>';
+
}
}
if (@invalidusers) {
@@ -528,8 +718,6 @@
$output .= '<li>'.$user.'</li>';
}
$output .= '</ul></p>';
- } else {
-
}
}
if (@limitexceeded) {
@@ -539,22 +727,30 @@
$output .= '<li>'.$user.'</li>';
}
$output .= '</ul></p>';
- } else {
-
}
}
- if (@enrollerrors) {
+ if (@processing_errors) {
if ($context eq 'course') {
$output .= '<p>'.&mt('The following enrollment requests could not be processed because an error occurred:').'<ul>';
- foreach my $user (@enrollerrors) {
+ foreach my $user (@processing_errors) {
$output .= '<li>'.$user.'</li>';
}
$output .= '</ul></p>';
} else {
-
+ $output .= '<p>'.&mt('The following course creation requests could not be processed because an error occurred:').'<ul>';
+ foreach my $cnum (@processing_errors) {
+ my $showcourse;
+ if (ref($requesthash{$cnum.'_approval'})) {
+ $showcourse = $requesthash{$cnum.'_approval'}{'description'};
+ } else {
+ $showcourse = $cnum;
+ }
+ $output .= '<li>'.$showcourse.'</li>';
+ }
+ $output .= '</ul></p>';
}
}
- if (@warn_approves) {
+ if (@warn_approves || @warn_rejects) {
if ($context eq 'course') {
$output .= '<p>'.&mt("For the following users, an error occurred when updating the user's own self-enroll requests record:").'<ul>';
foreach my $user (@warn_approves) {
@@ -562,18 +758,17 @@
}
$output .= '</ul></p>';
} else {
-
- }
- }
- if (@warn_rejects) {
- if ($context eq 'course') {
- $output .= '<p>'.&mt("For the following users, an error occurred when updating the user's own self-enroll requests record:").'<ul>';
- foreach my $user (@warn_rejects) {
- $output .= '<li>'.$user.'</li>';
+ $output .= '<p>'.&mt("For the following course requests an error occurred when updating the requestor's own course requests record:").'<ul>';
+ foreach my $cnum (@warn_approves,@warn_rejects) {
+ my $showcourse;
+ if (ref($requesthash{$cnum.'_approval'})) {
+ $showcourse = $requesthash{$cnum.'_approval'}{'description'};
+ } else {
+ $showcourse = $cnum;
+ }
+ $output .= '<li>'.$showcourse.'</li>';
}
$output .= '</ul></p>';
- } else {
-
}
}
return $output;
@@ -597,4 +792,74 @@
return (\%stucounts,\%idx,$classlist);
}
+sub course_creation {
+ my ($dom,$cnum,$context,$details,$logmsg,$newusermsg,$addresult,$enrollcount,$output,
+ $keysmsg,$domdefs,$longroles) = @_;
+ unless ((ref($details) eq 'HASH') && (ref($domdefs) eq 'HASH') &&
+ (ref($longroles) eq 'HASH')) {
+ return 'error: Invalid request';
+ }
+ my ($result,$ownername,$ownerdom);
+ my $crstype = $details->{'crstype'};
+ if ($context eq 'domain') {
+ $ownername = $details->{'owner'};
+ $ownerdom = $details->{'domain'};
+ } else {
+ $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') {
+ $owneremail = $emails{$email};
+ last if ($owneremail ne '');
+ }
+ my %reqdetails = &build_batchcreatehash($dom,$details,$owneremail,$domdefs);
+ my $cid = &LONCAPA::batchcreatecourse::build_course($dom,$cnum,'requestcourses',
+ \%reqdetails,$longroles,\$logmsg,\$newusermsg,\$addresult,
+ \$enrollcount,\$output,\$keysmsg,$ownerdom,$ownername,$cnum,$crstype);
+ if ($cid eq "/$dom/$cnum") {
+ $result = 'created';
+ } else {
+ $result = 'error: '.$cid;
+ }
+ return $result;
+}
+
+sub build_batchcreatehash {
+ my ($dom,$details,$owneremail,$domdefs) = @_;
+ my %batchhash;
+ my @items = qw{owner domain coursehome clonecrs clonedom datemode dateshift enrollstart enrollend accessstart accessend sections crosslists users};
+ if ((ref($details) eq 'HASH') && (ref($domdefs) eq 'HASH')) {
+ my $emailenc = &Apache::lonnet::escape($owneremail);
+ my $owner = $details->{'owner'}.':'.$details->{'domain'};
+ foreach my $item (@items) {
+ $batchhash{$item} = $details->{$item};
+ }
+ $batchhash{'title'} = $details->{'cdescr'};
+ $batchhash{'coursecode'} = $details->{'instcode'};
+ $batchhash{'emailenc'} = $emailenc;
+ $batchhash{'adds'} = $details->{'autoadds'};
+ $batchhash{'drops'} = $details->{'autodrops'};
+ $batchhash{'authtype'} = $domdefs->{'auth_def'};
+ $batchhash{'authparam'} = $domdefs->{'auth_arg_def'};
+ if ($details->{'crstype'} eq 'community') {
+ $batchhash{'crstype'} = 'Community';
+ } else {
+ $batchhash{'crstype'} = 'Course';
+ }
+ $batchhash{'users'}{$details->{$owner}} = {
+ firstname => $env{'environment.first'},
+ lastname => $env{'environment.last'},
+ emailenc => $emailenc,
+ email => $owneremail,
+ };
+ }
+ return %batchhash;
+}
+
1;
Index: loncom/interface/lonrequestcourse.pm
diff -u loncom/interface/lonrequestcourse.pm:1.13 loncom/interface/lonrequestcourse.pm:1.14
--- loncom/interface/lonrequestcourse.pm:1.13 Sat Aug 15 01:59:04 2009
+++ loncom/interface/lonrequestcourse.pm Sun Aug 16 19:16:16 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Request a course
#
-# $Id: lonrequestcourse.pm,v 1.13 2009/08/15 01:59:04 raeburn Exp $
+# $Id: lonrequestcourse.pm,v 1.14 2009/08/16 19:16:16 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -395,7 +395,6 @@
$people{'person_'.$i.'_role'} = 'selectbox',
$people{'person_'.$i.'_sec'} = 'selectbox',
$people{'person_'.$i.'_newsec'} = 'text',
- $people{'person_'.$i.'_sections'} = 'hidden',
}
my %personnelhash = (%{$elements{'new'}{'personnel'}},%people);
%{$elements{'new'}{'personnel'}} = %personnelhash;
@@ -553,7 +552,8 @@
my $formname = 'requestcrs';
my $nexttext = &mt('Next');
- $r->print('<div><form name="'.$formname.'" method="post" action="/adm/requestcourse">'.
+ $r->print(
+ '<div><form name="'.$formname.'" method="post" action="/adm/requestcourse">'.
&Apache::lonhtmlcommon::start_pick_box().
&Apache::lonhtmlcommon::row_title('Action').'
<input type="hidden" name="showdom" value="'.$dom.'" />
@@ -855,13 +855,13 @@
}
sub date_setting_table {
- my ($starttime,$endtime,$formname,$suffix,%datetitles) = @_;
+ my ($starttime,$endtime,$formname,$prefix,%datetitles) = @_;
my ($perpetual,$table);
- my $startform = &Apache::lonhtmlcommon::date_setter($formname,'start'.$suffix,
+ my $startform = &Apache::lonhtmlcommon::date_setter($formname,$prefix.'start',
$starttime,'','','',1,'','','',1);
- my $endform = &Apache::lonhtmlcommon::date_setter($formname,'end'.$suffix,
+ my $endform = &Apache::lonhtmlcommon::date_setter($formname,$prefix.'end',
$endtime,'','','',1,'','','',1);
- if ($suffix eq 'access') {
+ if ($prefix eq 'access') {
$perpetual = ' <span class="LC_nobreak"><label>'.
'<input type="checkbox" name="no_end_date" />'.
&mt('No end date').'</label></span>';
@@ -965,9 +965,7 @@
$existmult.'>'."\n".$existops.'</select>'.(' ' x3);
}
$sectionselector .= $newtitle.
- '<input type="text" name="person_'.$i.'_newsec" size="15" value="" />'.
- '<input type="hidden" name="person_'.$i.'_sections" value="" />'."\n";
-
+ '<input type="text" name="person_'.$i.'_newsec" size="15" value="" />'."\n";
$output .=
&Apache::lonhtmlcommon::row_title(&mt('Additional Personnel').'<br />'.
'<span class="LC_nobreak">'.$userlink.
@@ -992,40 +990,56 @@
sub print_request_status {
my ($dom) = @_;
- my %requests = &Apache::lonnet::dumpstore('courserequests',$env{'user.domain'},
- $env{'user.name'});
- my ($output,$formname,%queue_by_date);
- foreach my $key (keys(%requests)) {
- if (ref($requests{$key}) eq 'HASH') {
- my ($cdom,$cnum) = split('_',$key);
- next if ($cdom ne $dom);
- my $entry;
- my $timestamp = $requests{$key}{'timestamp'};
- my $crstype = $requests{$key}{'crstype'};
- my $status = $requests{$key}{'status'};
- next unless (($env{'form.crstype'} eq 'all') ||
- ($env{'form.crstype'} eq $crstype));
- next unless (($status eq 'approval') || ($status eq 'pending'));
- if (ref($requests{$key}{'details'}) eq 'HASH') {
- $entry = $key.':'.$crstype.':'.$requests{$key}{'details'}{'cdescr'};
- if ($crstype eq 'official') {
- $entry .= ':'.$requests{$key}{'details'}{'instcode'};
- }
- }
- if ($entry ne '') {
- if (exists($queue_by_date{$timestamp})) {
- if (ref($queue_by_date{$timestamp}) eq 'ARRAY') {
- push(@{$queue_by_date{$timestamp}},$entry);
+ my %statusinfo = &Apache::lonnet::dump('courserequests',$env{'user.domain'},
+ $env{'user.name'},'^status:'.$dom);
+ my ($output,$formname,%queue_by_date,%typenames);
+ if ($env{'form.crstype'} eq 'any') {
+ %typenames = &Apache::lonlocal::texthash (
+ official => 'Official course',
+ unofficial => 'Unofficial course',
+ community => 'Community',
+ );
+ }
+ foreach my $key (keys(%statusinfo)) {
+ if (($statusinfo{$key} eq 'approval') || ($statusinfo{$key} eq 'pending')) {
+ (undef,my($cdom,$cnum)) = split(':',$key);
+ next if ($cdom ne $dom);
+ my $requestkey = $cdom.'_'.$cnum;
+ if ($requestkey =~ /^($match_domain)_($match_courseid)$/) {
+ my %history = &Apache::lonnet::restore($requestkey,'courserequests',
+ $env{'user.domain'},$env{'user.name'});
+ my $entry;
+ my $timestamp = $history{'reqtime'};
+ my $crstype = $history{'crstype'};
+ my $disposition = $history{'disposition'};
+ next if ((exists($history{'status'})) && ($history{'status'} eq 'created'));
+ next unless (($env{'form.crstype'} eq 'any') ||
+ ($env{'form.crstype'} eq $crstype));
+ next unless (($disposition eq 'approval') ||
+ ($disposition eq 'pending'));
+ if (ref($history{'details'}) eq 'HASH') {
+ $entry = $requestkey.':'.$crstype.':'.
+ &escape($history{'details'}{'cdescr'});
+ if ($crstype eq 'official') {
+ $entry .= ':'.&escape($history{'details'}{'instcode'});
+ }
+ }
+ if ($entry ne '') {
+ if (exists($queue_by_date{$timestamp})) {
+ if (ref($queue_by_date{$timestamp}) eq 'ARRAY') {
+ push(@{$queue_by_date{$timestamp}},$entry);
+ }
+ } else {
+ @{$queue_by_date{$timestamp}} = ($entry);
}
- } else {
- @{$queue_by_date{$timestamp}} = ($entry);
}
}
}
}
$formname = 'requestcrs';
my @sortedtimes = sort {$a <=> $b} (keys(%queue_by_date));
- $output = '<form method="post" name="'.$formname.'" action="/adm/requestcourse" />'."\n".
+ $output = '<h3>'.&mt('Pending course requests').'</h3><div>'."\n".
+ '<form method="post" name="'.$formname.'" action="/adm/requestcourse" />'."\n".
'<input type="hidden" name="action" value="'.$env{'form.action'}.'" />'."\n".
'<input type="hidden" name="state" value="'.$env{'form.state'}.'" />'."\n".
'<input type="hidden" name="crstype" value="'.$env{'form.crstype'}.'" />'."\n";
@@ -1033,11 +1047,12 @@
$output .= &Apache::loncommon::start_data_table().
&Apache::loncommon::start_data_table_header_row().
'<th>'.&mt('Action').'</th>'.
- '<th>'.&mt('Description').'</th>';
- if ($env{'form.crstype'} eq 'all') {
+ '<th>'.&mt('Course Description').'</th>'.
+ '<th>'.&mt('Domain').'</th>';
+ if ($env{'form.crstype'} eq 'any') {
$output .= '<th>'.&mt('Type').'</th>';
}
- if (($env{'form.crstype'} eq 'all') || ($env{'form.crstype'} eq 'official')) {
+ if (($env{'form.crstype'} eq 'any') || ($env{'form.crstype'} eq 'official')) {
$output .= '<th>'.&mt('Institutional Code').'</th>';
}
$output .= '<th>'.&mt('Date requested').'</th>'.
@@ -1051,13 +1066,24 @@
my ($cdom,$cnum) = split('_',$key);
$output .= &Apache::loncommon::start_data_table_row().
'<td><input type="button" value="'.&mt('Select').'" onclick="javascript:viewrequest('."'$cdom','$cnum'".')" /></td>'.
- '<td>'.$desc.'</td>';
- if ($env{'form.crstype'} eq 'all') {
- $output .= '<td>'.&course_types($type).'</td>';
+ '<td>'.&unescape($desc).'</td>'.
+ '<td>'.$cdom.'</td>';
+ if ($env{'form.crstype'} eq 'any') {
+ my $typename = $typenames{$type};
+ if ($typename eq '') {
+ $typename = &mt('Unknown type');
+ }
+ $output .= '<td>'.$typename.'</td>';
}
- if (($env{'form.crstype'} eq 'all') ||
+ if (($env{'form.crstype'} eq 'any') ||
($env{'form.crstype'} eq 'official')) {
- $output .= '<td>'.$instcode.'</td>';
+ my $showinstcode;
+ if ($type eq 'official') {
+ $showinstcode = &unescape($instcode);
+ } else {
+ $showinstcode = &mt('Not applicable');
+ }
+ $output .= '<td>'.$showinstcode.'</td>';
}
$output .= '<td>'.$showtime.'</td>'.
&Apache::loncommon::end_data_table_row();
@@ -1069,8 +1095,8 @@
$output .= '<div>'.&mt('You have no matching course requests awaiting approval by a Domain Coordinator or held in a queue pending administrative action at your institution.').'</div>';
}
$output .= '
-<input type="button" name="prev" value="'.&mt('Back').'" onclick="javascript:backPage(document.'.$formname.",'crstype'".')" />
-</form>';
+<br /><input type="button" name="prev" value="'.&mt('Back').'" onclick="javascript:backPage(document.'.$formname.",'crstype'".')" />
+</form></div>';
return $output;
}
@@ -1243,6 +1269,24 @@
'<td>'.&mt('None').'</td></tr>';
for (my $i=0; $i<$env{'form.persontotal'}; $i++) {
if ($env{'form.person_'.$i.'_uname'} ne '') {
+ my @allsecs = &Apache::loncommon::get_env_multiple('form.person_'.$i.'_sec');
+ my $newsec = $env{'form.person_'.$i.'_newsec'};
+ $newsec =~ s/^\s+//;
+ $newsec =~s/\s+$//;
+ my @newsecs = split(/[\s,;]+/,$newsec);
+ foreach my $sec (@newsecs) {
+ next if ($sec =~ /\W/);
+ next if ($newsec eq 'none');
+ if ($sec ne '') {
+ unless (grep(/^\Q$sec\E$/,@allsecs)) {
+ push(@allsecs,$sec);
+ }
+ }
+ }
+ my $showsec = 'None';
+ if (@allsecs) {
+ $showsec = join(', ',@allsecs);
+ }
$personnel_values .=
'<tr><td>'.$env{'form.person_'.$i.'_firstname'}.' '.
$env{'form.person_'.$i.'_lastname'}.'</td>'.
@@ -1250,7 +1294,7 @@
$env{'form.person_'.$i.'_dom'}.'</td>'.
'<td>'.&Apache::lonnet::plaintext($env{'form.person_'.$i.'_role'},
$container).'</td>'.
- '<td>'.$env{'form.person_'.$i.'_sections'}.'</td></tr>';
+ '<td>'.$showsec.'</td></tr>';
}
}
my $output = '<p>'.&mt('Review the details of the course request before submission.').'</p>'.
@@ -1532,8 +1576,10 @@
$crosslistings{$i}{'loncapa'} = $env{'form.crosslist_'.$i.'_lcsec'};
}
}
+ } else {
+ $enrollstart = '';
+ $enrollend = '';
}
-
for (my $i=0; $i<$env{'form.persontotal'}; $i++) {
my $uname = $env{'form.person_'.$i.'_uname'};
my $udom = $env{'form.person_'.$i.'_uname'};
@@ -1559,15 +1605,17 @@
if ($role eq 'cc') {
@{$personnel{$uname.':'.$udom}{$role}{'usec'}} = ();
} else {
- my @currsec;
- if ($env{'form.person_'.$i.'_sections'} ne '') {
- my @sections = split(',',$env{'form.person_'.$i.'_sections'});
- foreach my $sec (@sections) {
- next if ($sec eq '');
- if (@currsec > 0) {
- unless(grep(/^\Q$sec\E$/,@currsec)) {
- push(@currsec,$sec);
- }
+ my @currsec = &Apache::loncommon::get_env_multiple('form.person_'.$i.'_sec');
+ my $newsec = $env{'form.person_'.$i.'_newsec'};
+ $newsec =~ s/^\s+//;
+ $newsec =~s/\s+$//;
+ my @newsecs = split(/[\s,;]+/,$newsec);
+ foreach my $sec (@newsecs) {
+ next if ($sec =~ /\W/);
+ next if ($newsec eq 'none');
+ if ($sec ne '') {
+ unless (grep(/^\Q$sec\E$/,@currsec)) {
+ push(@currsec,$sec);
}
}
}
@@ -1582,6 +1630,29 @@
}
}
my ($accessstart,$accessend) = &dates_from_form('accessstart','accessend');
+ my $autodrops = 0;
+ if ($env{'form.autodrops'}) {
+ $autodrops = $env{'form.autodrops'};
+ }
+ my $autoadds = 0;
+ if ($env{'form.autoadds'}) {
+ $autodrops = $env{'form.autoadds'};
+ }
+ my $sectotal = 0;
+ if ($env{'form.sectotal'}) {
+ $sectotal = $env{'form.sectotal'};
+ }
+ if ($env{'form.autoadds'}) {
+ $autodrops = $env{'form.autoadds'};
+ }
+ my $crosslisttotal = 0;
+ if ($env{'form.crosslisttotal'}) {
+ $crosslisttotal = $env{'form.crosslisttotal'};
+ }
+ my $instcode = '';
+ if (exists($env{'form.instcode'})) {
+ $instcode = $env{'form.instcode'};
+ }
my $details = {
owner => $env{'user.name'},
domain => $env{'user.domain'},
@@ -1590,17 +1661,17 @@
coursehome => $env{'form.chome'},
cdescr => $env{'form.cdescr'},
crstype => $env{'form.crstype'},
- instcode => $env{'form.instcode'},
+ instcode => $instcode,
clonedom => $env{'form.clonedom'},
clonecrs => $env{'form.clonecrs'},
datemode => $env{'form.datemode'},
- dateshift => $env{'form.datshift'},
- sectotal => $env{'form.sectotal'},
+ dateshift => $env{'form.dateshift'},
+ sectotal => $sectotal,
sections => \%sections,
- crosslisttotal => $env{'form.crosslisttotal'},
+ crosslisttotal => $crosslisttotal,
crosslists => \%crosslistings,
- autoadds => $env{'form.autoadds'},
- autodrops => $env{'form.autodrops'},
+ autoadds => $autoadds,
+ autodrops => $autodrops,
enrollstart => $enrollstart,
enrollend => $enrollend,
accessstart => $accessstart,
@@ -1620,9 +1691,9 @@
$output = &mt('Unrecognized course type: [_1]',$crstype);
}
} else {
- my ($disposition,$message);
+ my ($disposition,$message,$reqstatus);
my %reqhash = (
- timestamp => $now,
+ reqtime => $now,
crstype => $crstype,
details => $details,
);
@@ -1640,37 +1711,39 @@
} else {
$disposition = 'approval';
}
- $reqhash{'status'} = $disposition;
+ $reqhash{'disposition'} = $disposition;
+ $reqstatus = $disposition;
if ($disposition eq 'rejected') {
$output = &mt('Your course request was rejected.');
if ($message) {
$output .= '<div class="LC_warning">'.$message.'</div>';
}
} elsif ($disposition eq 'process') {
+ my %domdefs = &Apache::lonnet::get_domain_defaults($dom);
+ my ($logmsg,$newusermsg,$addresult,$enrollcount,$response,$keysmsg,%longroles);
+ my @roles = &Apache::lonuserutils::roles_by_context('course');
my $type = 'Course';
if ($crstype eq 'community') {
$type = 'Community';
}
- my %domdefs = &Apache::lonnet::get_domain_defaults($dom);
- my ($logmsg,$newusermsg,$addresult,$enrollcount,$response,$keysmsg,%longroles);
- my @roles = &Apache::lonuserutils::roles_by_context('course');
foreach my $role (@roles) {
$longroles{$role}=&Apache::lonnet::plaintext($role,$type);
}
- my $owneremail;
- my %emails = &Apache::loncommon::getemails();
- foreach my $email ('permanentemail','critnotification','notification') {
- $owneremail = $emails{$email};
- last if ($owneremail ne '');
- }
- my %reqdetails = &build_batchcreatehash($dom,$details,$owneremail,\%domdefs);
- my $cid = &LONCAPA::batchcreatecourse::build_course($dom,$cnum,'requestcourses',\%reqdetails,\%longroles,\$logmsg,\$newusermsg,\$addresult,\$enrollcount,\$output,\$keysmsg,$env{'user.domain'},$env{'user.name'},$cnum,$crstype);
- $disposition = 'created';
- if ($cid eq "/$dom/$cnum") {
+ my $result = &Apache::loncoursequeueadmin::course_creation($dom,$cnum,
+ 'autocreate',$details,\$logmsg,\$newusermsg,\$addresult,
+ \$enrollcount,\$response,\$keysmsg,\%domdefs,\%longroles);
+ if ($result eq 'created') {
$disposition = 'created';
- $output = &mt('Your course request has been processed and the course has been created.').'<br />'.&mt('You will need to logout and log-in again to be able to select a role in the course.');
+ $reqstatus = 'created';
+ $output = &mt('Your course request has been processed and the course has been created.').
+ '<br />'.
+ &mt('You will need to logout and log-in again to be able to select a role in the course.');
} else {
- $output = &mt('An error occurred when processing your course request.').'<br />'.&mt('You may want to review the request details and submit the request again.');
+ $output = '<span class="LC_error">'.
+ &mt('An error occurred when processing your course request.').
+ '<br />'.
+ &mt('You may want to review the request details and submit the request again.').
+ '</span>';
}
} else {
my $requestid = $cnum.'_'.$disposition;
@@ -1696,16 +1769,16 @@
}
$output = &mt('Your course request has been recorded.').'<br />';
if ($disposition eq 'approval') {
- $output .= &mt('Your course request has been recorded.').'<br />'.
- &mt('A message will be sent to your LON-CAPA account when a domain coordinator takes action on your request.').'<br />'.
- &mt('To access your LON-CAPA message, go to the Main Menu and click on "Send and Receive Messages".').'<br />';
+ $output .= &mt('A message will be sent to your LON-CAPA account when a domain coordinator takes action on your request.').'<br />'.
+ &mt('To access your LON-CAPA message, go to the Main Menu and click on "Send and Receive Messages".').'<br />';
if ($address ne '') {
$output.= &mt('An e-mail will also be sent to: [_1] when this occurs.',$address).'<br />';
}
if ($req_notifylist) {
my $fullname = &Apache::loncommon::plainname($env{'user.name'},
$env{'user.domain'});
- &Apache::loncoursequeueadmin::send_selfserve_notification($req_notifylist,$fullname,$now,$dom,$details);
+ my $sender = $env{'user.name'}.':'.$env{'user.domain'};
+ &Apache::loncoursequeueadmin::send_selfserve_notification($req_notifylist,"$fullname ($env{'user.name'}:$env{'user.domain'})",$cnum,$env{'form.cdescr'},$now,'coursereq',$sender);
}
} else {
$output .= '<div class="LC_info">'.
@@ -1715,23 +1788,32 @@
'</div>';
}
} else {
- $reqhash{'status'} = 'domainerror';
+ $reqstatus = 'domainerror';
$reqhash{'disposition'} = $disposition;
my $warning = &mt('An error occurred saving your request in the pending requests queue.');
$output = '<span class"LC_warning">'.$warning.'</span><br />';
}
}
- my $storeresult;
+ my ($storeresult,$statusresult);
if ($requestkey =~ /^($match_domain)_($match_courseid)$/) {
$storeresult = &Apache::lonnet::store_userdata(\%reqhash,$requestkey,
'courserequests');
+ if ($storeresult eq 'ok') {
+ my %status = (
+ 'status:'.$dom.':'.$cnum => $reqstatus,
+ );
+ $statusresult = &Apache::lonnet::put('courserequests',\%status);
+ }
} else {
$storeresult = 'error: invalid requestkey format';
}
if ($storeresult ne 'ok') {
$output .= '<span class="LC_warning">'.&mt('An error occurred saving a record of the details of your request: [_1].',$storeresult).'</span><br />';
&Apache::lonnet::logthis("Error saving course request - $requestkey for $env{'user.name'}:$env{'user.domain'} - $storeresult");
+ } elsif ($statusresult ne 'ok') {
+ $output .= '<span class="LC_warning">'.&mt('An error occurred saving a record of the status of your request: [_1].',$statusresult).'</span><br />';
+ &Apache::lonnet::logthis("Error saving course request status for $requestkey (for $env{'user.name'}:$env{'user.domain'}) - $statusresult");
}
}
return $output;
@@ -1853,38 +1935,6 @@
return;
}
-sub build_batchcreatehash {
- my ($dom,$details,$owneremail,$domdefs) = @_;
- my %batchhash;
- my @items = qw{owner domain coursehome clonecrs clonedom datemode dateshift enrollstart enrollend accessstart accessend sections crosslists users};
- if ((ref($details) eq 'HASH') && (ref($domdefs) eq 'HASH')) {
- my $emailenc = &Apache::lonnet::escape($owneremail);
- my $owner = $details->{'owner'}.':'.$details->{'domain'};
- foreach my $item (@items) {
- $batchhash{$item} = $details->{$item};
- }
- $batchhash{'title'} = $details->{'cdescr'};
- $batchhash{'coursecode'} = $details->{'instcode'};
- $batchhash{'emailenc'} = $emailenc;
- $batchhash{'adds'} = $details->{'autoadds'};
- $batchhash{'drops'} = $details->{'autodrops'};
- $batchhash{'authtype'} = $domdefs->{'auth_def'};
- $batchhash{'authparam'} = $domdefs->{'auth_arg_def'};
- if ($details->{'crstype'} eq 'community') {
- $batchhash{'crstype'} = 'Community';
- } else {
- $batchhash{'crstype'} = 'Course';
- }
- $batchhash{'users'}{$details->{$owner}} = {
- firstname => $env{'environment.first'},
- lastname => $env{'environment.last'},
- emailenc => $emailenc,
- email => $owneremail,
- };
- }
- return %batchhash;
-}
-
sub retrieve_settings {
my ($dom,$request_id) = @_;
my %reqinfo = &get_request_settings($request_id,$dom);
--raeburn1250450176--