';
}
- $output .= ¬ification_information($disposition,$req_notifylist,$cnum,$now);
+ $output .= ¬ification_information($disposition,$req_notifylist,$dom,$cnum,$now);
+ if ($disposition eq 'approval') {
+ my $fullname = &Apache::loncommon::plainname($env{'user.name'},
+ $env{'user.domain'});
+ my $postprocess =
+ &Apache::lonnet::auto_crsreq_update($dom,$cnum,$crstype,'queued',$env{'user.name'},
+ $env{'user.domain'},$fullname,$env{'form.cdescr'});
+ if ((ref($postprocess) eq 'HASH') &&
+ ((ref($postprocess->{'queuedmsg'}) eq 'HASH') || ($postprocess->{'queuedweb'}))) {
+ my $recipient = $env{'user.name'}.':'.$env{'user.domain'};
+ $output .= ¬ification_information($disposition,$recipient,$dom,$cnum,$now,undef,$postprocess);
+ }
+ }
}
if ($validationerror ne '') {
$output .= '
'.&mt('An error occurred validating your request with institutional data sources: [_1].',$validationerror).'
';
@@ -3840,7 +3955,7 @@ sub update_requestors_roles {
}
sub notification_information {
- my ($disposition,$req_notifylist,$cnum,$now,$code) = @_;
+ my ($disposition,$req_notifylist,$dom,$cnum,$now,$code,$postprocess) = @_;
my %emails = &Apache::loncommon::getemails();
my $address;
if (($emails{'permanentemail'} ne '') || ($emails{'notification'} ne '')) {
@@ -3858,9 +3973,34 @@ sub notification_information {
}
if ($req_notifylist) {
my $fullname = &Apache::loncommon::plainname($env{'user.name'},
- $env{'user.domain'});
+ $env{'user.domain'});
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);
+ &Apache::loncoursequeueadmin::send_selfserve_notification($req_notifylist,"$fullname ($env{'user.name'}:$env{'user.domain'})",
+ 'undef',$env{'form.cdescr'},$now,'coursereq',$sender);
+ }
+ if (ref($postprocess) eq 'HASH') {
+ if (ref($postprocess->{'queuedmsg'}) eq 'ARRAY') {
+ if (scalar(@{$postprocess->{'queuedmsg'}}) > 0) {
+ my $recipient = $env{'user.name'}.':'.$env{'user.domain'};
+ my $sender = $recipient;
+ my $addmsg = [];
+ foreach my $item (@{$postprocess->{'queuedmsg'}}) {
+ if (ref($item) eq 'HASH') {
+ if ($item->{'mt'} ne '') {
+ push(@{$addmsg},$item);
+ }
+ }
+ }
+ if (scalar(@{$addmsg}) > 0) {
+ &Apache::loncoursequeueadmin::send_selfserve_notification($recipient,$addmsg,undef,
+ $env{'form.cdescr'},$now,
+ 'queuedreq',$sender);
+ }
+ }
+ }
+ if ($postprocess->{'queuedweb'}) {
+ $output .= $postprocess->{'queuedweb'};
+ }
}
} elsif ($disposition eq 'pending') {
$output .= '
'.
@@ -3868,23 +4008,48 @@ sub notification_information {
&mt("Usually this means that your institution's information systems do not list you among the instructional personnel for this course.").' '.
&mt('The list of instructional personnel for the course will be automatically checked daily, and once you are listed the request will be processed.').
'
';
- } elsif (($disposition eq 'created') && ($code)) {
- my $codemsg = [{
- mt => 'Students can automatically select your course by entering this code: [_1]',
- args => [$code],
- }];
- $output .= '
'.
- &mt('Students can automatically select your course by entering this code: [_1].',''.$code.'').
- ' '.
- &mt('A message has been sent to your LON-CAPA account with this information.');
- if ($address ne '') {
- $output.= ' '.&mt('And an e-mail has also been sent to: [_1] with this code.',$address);
- }
- $output .= '
';
- my $sender = $env{'user.name'}.':'.$env{'user.domain'};
- if ($code) {
- &Apache::loncoursequeueadmin::send_selfserve_notification($req_notifylist,$codemsg,$cnum,$env{'form.cdescr'},
- $now,'uniquecode',$sender);
+ } elsif ($disposition eq 'created') {
+ if (($code) || ((ref($postprocess) eq 'HASH') &&
+ ((ref($postprocess->{'createdmsg'}) eq 'ARRAY') || ($postprocess->{'createdweb'})))) {
+ my $addmsg = [];
+ my $recipient = $env{'user.name'}.':'.$env{'user.domain'};
+ my $sender = $recipient;
+ if ($code) {
+ push(@{$addmsg},{
+ mt => 'Students can automatically select your course: "[_1]" by entering this code: [_2]',
+ args => [$env{'form.cdescr'},$code],
+ });
+ $output .= '
'.
+ &mt('Students can automatically select your course by entering this code: [_1].',''.$code.'').
+ ' '.
+ &mt('A message has been sent to your LON-CAPA account with this information.');
+ if ($address ne '') {
+ $output.= ' '.&mt('An e-mail has also been sent to: [_1] with this code.',$address);
+ }
+ $output .= '
';
+ }
+ if (ref($postprocess) eq 'HASH') {
+ if (ref($postprocess->{'createdmsg'}) eq 'ARRAY') {
+ foreach my $item (@{$postprocess->{'createdmsg'}}) {
+ if (ref($item) eq 'HASH') {
+ if ($item->{'mt'} ne '') {
+ push(@{$addmsg},$item);
+ }
+ }
+ }
+ }
+ if ($postprocess->{'createdweb'}) {
+ $output .= $postprocess->{'createdweb'}
+ }
+ }
+ if (scalar(@{$addmsg}) > 0) {
+ my $type = 'createdreq';
+ if ($code) {
+ $type = 'uniquecode';
+ }
+ &Apache::loncoursequeueadmin::send_selfserve_notification($recipient,$addmsg,$dom.'_'.$cnum,$env{'form.cdescr'},
+ $now,$type,$sender);
+ }
}
} else {
$output .= '
'.
@@ -4110,7 +4275,7 @@ sub generate_date_items {
}
sub print_textbook_form {
- my ($r,$dom,$incdoms,$domdefs,$settings) = @_;
+ my ($r,$dom,$incdoms,$domdefs,$settings,$can_request) = @_;
my ($bookshash,%ordered);
my $crstype = 'textbook';
#
@@ -4170,9 +4335,18 @@ sub print_textbook_form {
$loaditems{'onload'} = 'javascript:uncheckAllRadio();';
$r->print(&header('Course Request',$jscript,\%loaditems));
+ if (ref($can_request) eq 'HASH') {
+ unless ((scalar(keys(%{$can_request})) == 1) && ($can_request->{'textbook'})) {
+ &Apache::lonhtmlcommon::add_breadcrumb(
+ { href => '/adm/requestcourse',
+ text => 'Pick action',
+ });
+ }
+ }
&Apache::lonhtmlcommon::add_breadcrumb({text=>'Course Request'});
$r->print(&Apache::lonhtmlcommon::breadcrumbs('Course Requests','Course_Requests'));
+ &startContentScreen($r,'textbookrequests');
#
# Show domain selector form, if required.
#
@@ -4369,21 +4543,37 @@ sub print_textbook_form {
' '.&mt($accesstitles{'end'}).$endform.'
');
#
+# Display any custom fields for this course type
+#
+ my $fullname = &Apache::loncommon::plainname($env{'user.name'},
+ $env{'user.domain'});
+ my $postprocess = &Apache::lonnet::auto_crsreq_update($dom,undef,$crstype,'review',
+ $env{'user.name'},
+ $env{'user.domain'},$fullname);
+ if (ref($postprocess) eq 'HASH') {
+ if ($postprocess->{'reviewweb'}) {
+ $r->print($postprocess->{'reviewweb'});
+ }
+ }
+
+#
# Submit button
#
- $r->print(''.
+ $r->print(''.
+ ''.
'');
#
# End request form
#
- $r->print(''.
- &Apache::loncommon::end_page());
+ $r->print('');
+ &endContentScreen($r).
+ $r->print(&Apache::loncommon::end_page());
return;
}
sub process_textbook_request {
- my ($r,$dom,$action,$domdefs,$domconfig) = @_;
+ my ($r,$dom,$action,$domdefs,$domconfig,$can_request) = @_;
my ($uniquecode,$req_notifylist);
my $crstype = 'textbook';
if (ref($domconfig) eq 'HASH') {
@@ -4425,6 +4615,14 @@ sub process_textbook_request {
}
$r->print(&header('Course Creation'));
+ if (ref($can_request) eq 'HASH') {
+ unless ((scalar(keys(%{$can_request})) == 1) && ($can_request->{'textbook'})) {
+ &Apache::lonhtmlcommon::add_breadcrumb(
+ { href => '/adm/requestcourse',
+ text => 'Pick action',
+ });
+ }
+ }
&Apache::lonhtmlcommon::add_breadcrumb(
{ href => '/adm/requestcourse',
text => "Create Course",
@@ -4432,6 +4630,7 @@ sub process_textbook_request {
);
&Apache::lonhtmlcommon::add_breadcrumb({text=>'Request Processed'});
$r->print(&Apache::lonhtmlcommon::breadcrumbs('Course Requests','Course_Requests'));
+ &startContentScreen($r,'textbookrequests');
my $details = {
owner => $env{'user.name'},
@@ -4459,6 +4658,7 @@ sub process_textbook_request {
} elsif ($result eq 'created') {
$r->print('