'."\n".
&Apache::loncommon::end_page());
return;
@@ -1468,6 +1498,15 @@ sub print_request_form {
}
$r->print(&print_review($dom,\@codetitles,\%cat_titles,\%cat_order,\@code_order,'','',\@disallowed,\%disallowmsg,$instcredits).
'');
+ my $fullname = &Apache::loncommon::plainname($env{'user.name'},
+ $env{'user.domain'});
+ my $postprocess = &Apache::lonnet::auto_crsreq_update($dom,$cnum,$crstype,'review',$env{'user.name'},
+ $env{'user.domain'},$fullname,$env{'form.cdescr'});
+ if (ref($postprocess) eq 'HASH') {
+ if ($postprocess->{'reviewweb'}) {
+ $r->print($postprocess->{'reviewweb'});
+ }
+ }
if ($crstype eq 'community') {
$navtxt{'next'} = &mt('Submit community request');
} else {
@@ -1488,25 +1527,8 @@ sub print_request_form {
''.&mt('Make another request').'
');
}
if (&Apache::loncoursequeueadmin::author_prompt()) {
- $r->print('
'.&mt('Access to authoring space').'
'.
- '
'.
- &mt('Although assessment items can be created directly inside a course, such items only use part of the assessment capabilities of LON-CAPA.').
- ' '.
- &mt('By contrast, items created in authoring space, then imported into a course, can use all of the features of the assessment engine.').'
'.
+ &mt('Although assessment items can be created directly inside a course, such items only use part of the assessment capabilities of LON-CAPA.').
+ ' '.
+ &mt('By contrast, items created in authoring space, then imported into a course, can use all of the features of the assessment engine.').'
'.
+ ''.
+ ''.
+ ''.
+ ''.
+ ''.
+ ''.
+ ''.
+ ' ');
+}
+
sub get_usertype {
my ($persondom,$personname,$curr_rules,$got_rules) = @_;
my ($rules,$ruleorder) =
@@ -2105,6 +2150,7 @@ sub sorted_request_history {
my $crstype = $history{'crstype'};
my $disposition = $history{'disposition'};
my $status = $history{'status'};
+ my $uniquecode = $history{'code'};
if ($action eq 'view') {
next if ((exists($history{'status'})) && ($history{'status'} eq 'created'));
} else {
@@ -2120,7 +2166,7 @@ sub sorted_request_history {
$entry = $requestkey.':'.$crstype.':'.
&escape($history{'details'}{'cdescr'});
if ($action eq 'log') {
- $entry .= ':'.$lastupdate.':';
+ $entry .= ':'.$uniquecode.':'.$lastupdate.':';
if ($statusinfo{$key} ne '') {
$entry .= $statusinfo{$key};
} elsif ($status ne '') {
@@ -2333,7 +2379,7 @@ ENDJS
}
sub print_request_logs {
- my ($r,$dom,$jscript,$loaditems,$crumb) = @_;
+ my ($r,$dom,$jscript,$loaditems,$crumb,$usetabs) = @_;
my $title;
if ($env{'form.crstype'} eq 'community') {
$title = 'Community Request Logs';
@@ -2343,6 +2389,9 @@ sub print_request_logs {
$title = 'Course Request Logs';
}
$r->print(&header($title,$jscript,$loaditems).$crumb);
+ if ($usetabs) {
+ &startContentScreen($r,'textbooklogs');
+ }
my $formname = 'requestcrs';
$r->print(''.
- &Apache::loncommon::end_page());
+ if ($usetabs) {
+ $r->print('');
+ }
+ $r->print('');
+ if ($usetabs) {
+ &endContentScreen($r);
+ }
+ $r->print(&Apache::loncommon::end_page());
return;
}
@@ -3253,16 +3337,17 @@ sub print_request_outcome {
$output = &mt('Invalid LON-CAPA course number for the new course')."\n";
return $output;
}
-
- %domconfig = &Apache::lonnet::get_dom('configuration',['requestcourses'],$dom);
+ $crstype = $env{'form.crstype'};
+ my %domconfig = &Apache::lonnet::get_dom('configuration',['requestcourses'],$dom);
if (ref($domconfig{'requestcourses'}) eq 'HASH') {
if (ref($domconfig{'requestcourses'}{'notify'}) eq 'HASH') {
$req_notifylist = $domconfig{'requestcourses'}{'notify'}{'approval'};
}
- $uniquecode = $domconfig{'requestcourses'}{'uniquecode'};
+ if (ref($domconfig{'requestcourses'}{'uniquecode'}) eq 'HASH') {
+ $uniquecode = $domconfig{'requestcourses'}{'uniquecode'}{$crstype};
+ }
}
$now = time;
- $crstype = $env{'form.crstype'};
my $ccrole = 'cc';
if ($crstype eq 'community') {
$ccrole = 'co';
@@ -3486,11 +3571,18 @@ sub print_request_outcome {
accessend => $accessend,
personnel => \%personnel,
};
- my (@inststatuses,$storeresult,$creationresult);
+ my ($result,$output) = &process_request($dom,$cnum,$crstype,$now,$details,$instcode,
+ $req_notifylist,\@instsections,\%domconfig);
+ return ($result,$output);
+}
+
+sub process_request {
+ my ($dom,$cnum,$crstype,$now,$details,$instcode,$req_notifylist,$instsections,$domconfig) = @_;
+ my (@inststatuses,$storeresult,$creationresult,$output);
my $val =
&Apache::loncoursequeueadmin::get_processtype('course',$env{'user.name'},
$env{'user.domain'},$env{'user.adv'},
- $dom,$crstype,\@inststatuses,\%domconfig);
+ $dom,$crstype,\@inststatuses,$domconfig);
if ($val eq '') {
if ($crstype eq 'official') {
$output = &mt('You are not permitted to request creation of official courses.');
@@ -3525,8 +3617,10 @@ sub print_request_outcome {
$inststatuslist = join(',',@inststatuses);
}
my $instseclist;
- if (@instsections > 0) {
- $instseclist = join(',',@instsections);
+ if (ref($instsections) eq 'ARRAY') {
+ if (@{$instsections} > 0) {
+ $instseclist = join(',',@{$instsections});
+ }
}
$validationchk =
&Apache::lonnet::auto_courserequest_validation($dom,
@@ -3548,7 +3642,32 @@ sub print_request_outcome {
}
$reqhash{'disposition'} = $disposition;
$reqstatus = $disposition;
- my ($modified,$queued);
+ my ($modified,$queued,$coursedesc,%customitems);
+ unless ($disposition eq 'rejected') {
+ if (ref($details) eq 'HASH') {
+ $coursedesc = $details->{'cdescr'};
+ }
+ my $fullname = &Apache::loncommon::plainname($env{'user.name'},
+ $env{'user.domain'});
+ my $inprocess = &Apache::lonnet::auto_crsreq_update($dom,$cnum,$crstype,'process',$env{'user.name'},
+ $env{'user.domain'},$fullname,$coursedesc);
+ if (ref($inprocess) eq 'HASH') {
+ if (ref($inprocess->{'formitems'}) eq 'HASH') {
+ foreach my $key (keys(%{$inprocess->{'formitems'}})) {
+ if ($inprocess->{'formitems'}->{$key} eq 'multiple') {
+ if (exists($env{'form.'.$key})) {
+ @{$customitems{$key}} = &Apache::loncommon::get_env_multiple($env{'form.'.$key});
+ }
+ } else {
+ if (exists($env{'form.'.$key})) {
+ $customitems{$key} = $env{'form.'.$key};
+ $reqhash{'custom'}{$key} = $customitems{$key};
+ }
+ }
+ }
+ }
+ }
+ }
if ($disposition eq 'rejected') {
if ($crstype eq 'community') {
$output = &mt('Your community request was rejected.');
@@ -3570,9 +3689,10 @@ sub print_request_outcome {
foreach my $role (@roles) {
$longroles{$role}=&Apache::lonnet::plaintext($role,$type);
}
- my $result = &Apache::loncoursequeueadmin::course_creation($dom,$cnum,
- 'autocreate',$details,\$logmsg,\$newusermsg,\$addresult,
- \$enrollcount,\$response,\$keysmsg,\%domdefs,\%longroles,\$code);
+ my ($result,$postprocess) = &Apache::loncoursequeueadmin::course_creation($dom,$cnum,
+ 'autocreate',$details,\$logmsg,\$newusermsg,\$addresult,
+ \$enrollcount,\$response,\$keysmsg,\%domdefs,\%longroles,
+ \$code,\%customitems);
if ($result eq 'created') {
$disposition = 'created';
$reqstatus = 'created';
@@ -3583,9 +3703,13 @@ sub print_request_outcome {
} else {
$output = '
'.&mt('Your course request has been processed and the course has been created.');
}
- if ($code) {
+ if (($code) || ((ref($postprocess) eq 'HASH') &&
+ (($postprocess->{'createdweb'}) || ($postprocess->{'createdmsg'})))) {
$output .= ¬ification_information($disposition,$env{'user.name'}.':'.$env{'user.domain'},
- $cnum,$now,$code);
+ $cnum,$now,$code,$postprocess);
+ }
+ if ($code) {
+ $reqhash{'code'} = $code;
}
$output .= ' '.$role_result.'
';
$creationresult = 'created';
@@ -3603,7 +3727,7 @@ sub print_request_outcome {
}
} else {
my $requestid = $cnum.'_'.$disposition;
- my $request = {
+ my $request = {
$requestid => {
timestamp => $now,
crstype => $crstype,
@@ -3659,6 +3783,18 @@ sub print_request_outcome {
$output .= '
'.&mt('Your course request has been updated').'
';
}
$output .= ¬ification_information($disposition,$req_notifylist,$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,$cnum,$now,undef,$postprocess);
+ }
+ }
}
if ($validationerror ne '') {
$output .= '
'.&mt('An error occurred validating your request with institutional data sources: [_1].',$validationerror).'
';
@@ -3810,7 +3946,7 @@ sub update_requestors_roles {
}
sub notification_information {
- my ($disposition,$req_notifylist,$cnum,$now,$code) = @_;
+ my ($disposition,$req_notifylist,$cnum,$now,$code,$postprocess) = @_;
my %emails = &Apache::loncommon::getemails();
my $address;
if (($emails{'permanentemail'} ne '') || ($emails{'notification'} ne '')) {
@@ -3828,32 +3964,82 @@ 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);
}
+ 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,$cnum,
+ $env{'form.cdescr'},$now,
+ 'queuedreq',$sender);
+ }
+ }
+ }
+ if ($postprocess->{'queuedweb'}) {
+ $output .= $postprocess->{'queuedweb'};
+ }
+ }
} elsif ($disposition eq 'pending') {
$output .= '
'.
&mt('Your request has been placed in a queue pending administrative action.').' '.
&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).' ';
- }
- 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 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('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,$cnum,$env{'form.cdescr'},
+ $now,$type,$sender);
+ }
}
} else {
$output .= '
'.
@@ -4078,5 +4264,546 @@ sub generate_date_items {
return;
}
+sub print_textbook_form {
+ my ($r,$dom,$incdoms,$domdefs,$settings,$can_request) = @_;
+ my ($bookshash,%ordered);
+ my $crstype = 'textbook';
+#
+# Retrieve list of textbook courses cloneable by user
+#
+ my $numbook;
+ if (ref($settings) eq 'HASH') {
+ $bookshash = $settings->{'textbooks'};
+ if (ref($bookshash) eq 'HASH') {
+ foreach my $item (keys(%{$bookshash})) {
+ my ($clonedom,$clonecrs) = split(/_/,$item);
+ if (ref($bookshash->{$item}) eq 'HASH') {
+ my ($clonedom,$clonecrs) = split(/_/,$item);
+ if (&Apache::loncoursequeueadmin::can_clone_course($env{'user.name'},
+ $env{'user.domain'},$clonecrs,$clonedom,$crstype)) {
+
+ my $num = $bookshash->{$item}{'order'};
+ $ordered{$num} = $item;
+ $numbook ++;
+ }
+ }
+ }
+ }
+ }
+
+#
+# Check if domain has multiple library servers
+#
+ my ($home_server_pick,$numlib) =
+ &Apache::loncommon::home_server_form_item($dom,'chome',
+ 'default','hide');
+ if ($numlib > 1) {
+ $home_server_pick = &mt('Home Server for Course').': '.$home_server_pick.' ';
+ }
+
+#
+# Retrieve information about courses owned by user, or in which user has an active or future
+# Course Coordinator role
+#
+ my $numcurrent;
+ my %cloneable = &Apache::lonnet::courseiddump($dom,'.',1,'.',$env{'user.name'}.':'.$env{'user.domain'},
+ undef,undef,undef,'Course');
+ my %ccroles = &Apache::lonnet::get_my_roles($env{'user.name'},$env{'user.domain'},'userroles',
+ ['active','future'],['cc']);
+ foreach my $role (keys(%ccroles)) {
+ my ($cnum,$cdom,$rest) = split(/:/,$role,3);
+ unless (exists($cloneable{$cdom.'_'.$cnum})) {
+ my %courseinfo = &Apache::lonnet::coursedescription($cdom.'_'.$cnum,{'one_time' => 1});
+ $cloneable{$cdom.'_'.$cnum} = \%courseinfo;
+ }
+ }
+
+ my $numcurrent = scalar(keys(%cloneable));
+
+ my $jscript = &textbook_request_javascript($numbook,$numcurrent);
+ my %loaditems;
+ $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.
+#
+ if (@{$incdoms} > 1) {
+ my $onchange = 'this.form.submit()';
+ $r->print('