--- loncom/interface/lonrequestcourse.pm 2014/01/08 17:18:12 1.76 +++ loncom/interface/lonrequestcourse.pm 2015/09/01 16:40:20 1.95 @@ -1,7 +1,7 @@ # The LearningOnline Network # Request a course # -# $Id: lonrequestcourse.pm,v 1.76 2014/01/08 17:18:12 bisitz Exp $ +# $Id: lonrequestcourse.pm,v 1.95 2015/09/01 16:40:20 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -172,13 +172,29 @@ sub handler { if ($can_request{'textbook'}) { &process_textbook_request($r,$dom,$action,\%domdefs,\%domconfig,\%can_request); } else { - &textbook_request_disabled($r,$dom,\%can_request); + &textbook_request_disabled($r,$dom,$action,\%can_request); + } + } elsif ($action eq 'display') { + my ($uname,$udom,$result,$warning) = &domcoord_display($dom); + if ($warning ne '') { + my $args = { only_body => 1 }; + $r->print(&header('Course/Community Requests','','' ,'',$args). + '<h3>'.&mt('Course/Community Request Details').'</h3>'. + '<div class="LC_warning">'.$warning.'</div>'. + &close_popup_form()); + } else { + $states{'display'} = ['details']; + my $loaditems = &onload_action($action,$state); + my $page = 0; + &request_administration($r,$action,$state,$page,\%states,$dom,$jscript, + $loaditems,'','','','','',$showcredits,'','', + $uname,$udom); } } else { if ($can_request{'textbook'}) { &print_textbook_form($r,$dom,\@incdoms,\%domdefs,$domconfig{'requestcourses'},\%can_request); } else { - &textbook_request_disabled($r,$dom,\%can_request); + &textbook_request_disabled($r,$dom,$action,\%can_request); } } return OK; @@ -232,46 +248,7 @@ sub handler { my ($page,$crumb,$newinstcode,$codechk,$checkedcode,$description) = &get_breadcrumbs($dom,$action,\$state,\%states,\%trail); if ($action eq 'display') { - if (($dom eq $env{'request.role.domain'}) && (&Apache::lonnet::allowed('ccc',$dom))) { - if ($env{'form.cnum'} ne '') { - my $cnum = $env{'form.cnum'}; - my $queue = $env{'form.queue'}; - my $reqkey = $cnum.'_'.$queue; - my $namespace = 'courserequestqueue'; - my $domconfig = &Apache::lonnet::get_domainconfiguser($dom); - my %queued = - &Apache::lonnet::get($namespace,[$reqkey],$dom,$domconfig); - if (ref($queued{$reqkey}) eq 'HASH') { - $uname = $queued{$reqkey}{'ownername'}; - $udom = $queued{$reqkey}{'ownerdom'}; - if (($udom =~ /^$match_domain$/) && ($uname =~ /^$match_username$/)) { - $result = &retrieve_settings($dom,$cnum,$udom,$uname); - } else { - if ($env{'form.crstype'} eq 'community') { - $warning = &mt('Invalid username or domain for community requestor'); - } else { - $warning = &mt('Invalid username or domain for course requestor'); - } - } - } else { - if ($env{'form.crstype'} eq 'community') { - $warning = &mt('No information was found for this community request.'); - } else { - $warning = &mt('No information was found for this course request.'); - } - } - } else { - $warning = &mt('No course request ID provided.'); - } - } else { - if ($env{'form.crstype'} eq 'any') { - $warning = &mt('You do not have rights to view course or community request information.'); - } elsif ($env{'form.crstype'} eq 'community') { - $warning = &mt('You do not have rights to view community request information.'); - } else { - $warning = &mt('You do not have rights to view course request information.'); - } - } + ($uname,$udom,$result,$warning) = &domcoord_display($dom); } elsif ((defined($state)) && (defined($action))) { if (($action eq 'view') && ($state eq 'details')) { if ((defined($env{'form.showdom'})) && (defined($env{'form.cnum'}))) { @@ -334,6 +311,8 @@ sub handler { $jscript = &Apache::lonhtmlcommon::set_form_elements($elementsref,\%stored); if ($state eq 'courseinfo') { $jscript .= &cloning_javascript(); + } elsif ($state eq 'process') { + $jscript .= &processing_javascript(); } } } @@ -436,7 +415,7 @@ function setCloneDisplay(courseForm) { for (var i=0; i<courseForm.cloning.length; i++) { if (courseForm.cloning[i].checked) { if (courseForm.cloning[i].value == 1) { - document.getElementById('cloneoptions').style.display="block";; + document.getElementById('cloneoptions').style.display="block"; } } } @@ -445,6 +424,17 @@ function setCloneDisplay(courseForm) { END } +sub processing_javascript { + return <<"END"; +function hideProcessing() { + if (document.getElementById('processing')) { + document.getElementById('processing').style.display="none"; + } +} + +END +} + sub get_breadcrumbs { my ($dom,$action,$state,$states,$trail) = @_; my ($crumb,$newinstcode,$codechk,$checkedcode,$numtitles,$description); @@ -486,27 +476,29 @@ sub get_breadcrumbs { } } } - for (my $i=0; $i<@{$states->{$action}}; $i++) { - if ($$state eq $states->{$action}[$i]) { - &Apache::lonhtmlcommon::add_breadcrumb( - {text=>"$trail->{$$state}"}); - $crumb = &Apache::lonhtmlcommon::breadcrumbs('Course/Community Requests','Course_Requests'); - last; - } else { - if (($$state eq 'process') || ($$state eq 'removal') || ($$state eq 'reqauthor')) { + if (ref($states->{$action}) eq 'ARRAY') { + for (my $i=0; $i<@{$states->{$action}}; $i++) { + if ($$state eq $states->{$action}[$i]) { &Apache::lonhtmlcommon::add_breadcrumb( - { href => '/adm/requestcourse', - text => "$trail->{$states->{$action}[$i]}", - } - ); + {text=>"$trail->{$$state}"}); + $crumb = &Apache::lonhtmlcommon::breadcrumbs('Course/Community Requests','Course_Requests'); + last; } else { - &Apache::lonhtmlcommon::add_breadcrumb( + if (($$state eq 'process') || ($$state eq 'removal') || ($$state eq 'reqauthor')) { + &Apache::lonhtmlcommon::add_breadcrumb( + { href => '/adm/requestcourse', + text => "$trail->{$states->{$action}[$i]}", + } + ); + } else { + &Apache::lonhtmlcommon::add_breadcrumb( { href => "javascript:backPage(document.requestcrs,'$states->{$action}[$i]')", text => "$trail->{$states->{$action}[$i]}", } - ); - } - } - } + ); + } + } + } + } } else { &Apache::lonhtmlcommon::add_breadcrumb( {text=>'Pick Action'}); @@ -720,6 +712,9 @@ sub onload_action { if ($state eq 'courseinfo') { $loaditems{'onload'} .= 'javascript:setCloneDisplay(document.requestcrs);'; } + if ($state eq 'process') { + $loaditems{'onload'} .= 'javascript:hideProcessing();'; + } } return \%loaditems; } @@ -773,7 +768,7 @@ END "; } } - my %lt = &Apache::lonlocal::texthash( + my %js_lt = &Apache::lonlocal::texthash( official => 'You are not permitted to request creation of an official course in this domain.', unofficial => 'You are not permitted to request creation of an unofficial course in this domain.', community => 'You are not permitted to request creation of a community in this domain.', @@ -781,33 +776,34 @@ END all => 'You must choose a specific course type when making a new course request.', allt => '"All types" is not allowed.', ); + &js_escape(\%js_lt); $js .= <<END; if (crschoice == 'official') { if (official != 1) { - alert("$lt{'official'}"); + alert("$js_lt{'official'}"); return false; } } else { if (crschoice == 'unofficial') { if (unofficial != 1) { - alert("$lt{'unofficial'}"); + alert("$js_lt{'unofficial'}"); return false; } } else { if (crschoice == 'community') { if (community != 1) { - alert("$lt{'community'}"); + alert("$js_lt{'community'}"); return false; } } else { if (crschoice == 'textbook') { if (textbook != 1) { - alert("$lt{'community'}"); + alert("$js_lt{'textbook'}"); return false; } } else { if (actionchoice == 'new') { - alert('$lt{'all'}'+'\\n'+'$lt{'allt'}'); + alert('$js_lt{'all'}'+'\\n'+'$js_lt{'allt'}'); return false; } } @@ -944,7 +940,8 @@ END if ($action eq 'new') { my $jsextra; if (($state eq 'courseinfo') || ($state eq 'codepick')) { - $jsextra = "\n".&Apache::loncommon::coursebrowser_javascript($dom); + $jsextra = "\n".&Apache::loncommon::coursebrowser_javascript($dom,'','','','','', + $newinstcode); } elsif ($state eq 'enrollment') { if (($env{'form.crstype'} eq 'official') && (&Apache::lonnet::auto_run('',$dom))) { @@ -1129,10 +1126,58 @@ END return; } +sub domcoord_display { + my ($dom) = @_; + my ($uname,$udom,$result,$warning); + if (($dom eq $env{'request.role.domain'}) && (&Apache::lonnet::allowed('ccc',$dom))) { + if ($env{'form.cnum'} ne '') { + my $cnum = $env{'form.cnum'}; + my $queue = $env{'form.queue'}; + my $reqkey = $cnum.'_'.$queue; + my $namespace = 'courserequestqueue'; + my $domconfig = &Apache::lonnet::get_domainconfiguser($dom); + my %queued = + &Apache::lonnet::get($namespace,[$reqkey],$dom,$domconfig); + if (ref($queued{$reqkey}) eq 'HASH') { + $uname = $queued{$reqkey}{'ownername'}; + $udom = $queued{$reqkey}{'ownerdom'}; + if (($udom =~ /^$match_domain$/) && ($uname =~ /^$match_username$/)) { + $result = &retrieve_settings($dom,$cnum,$udom,$uname); + } else { + if ($env{'form.crstype'} eq 'community') { + $warning = &mt('Invalid username or domain for community requestor'); + } else { + $warning = &mt('Invalid username or domain for course requestor'); + } + } + } else { + if ($env{'form.crstype'} eq 'community') { + $warning = &mt('No information was found for this community request.'); + } else { + $warning = &mt('No information was found for this course request.'); + } + } + } else { + $warning = &mt('No course request ID provided.'); + } + } else { + if ($env{'form.crstype'} eq 'any') { + $warning = &mt('You do not have rights to view course or community request information.'); + } elsif ($env{'form.crstype'} eq 'community') { + $warning = &mt('You do not have rights to view community request information.'); + } else { + $warning = &mt('You do not have rights to view course request information.'); + } + } + return ($uname,$udom,$result,$warning); +} + sub enrollment_lcsec_js { my %alerts = §ion_check_alerts(); my $secname = $alerts{'badsec'}; my $secnone = $alerts{'reserved'}; + &js_escape(\$secname); + &js_escape(\$secnone); my $output = ' function validateEnrollSections(formname,nextstate) { var badsectotal = 0; @@ -1190,8 +1235,10 @@ function validateEnrollSections(formname sub personnel_lcsec_js { my %alerts = §ion_check_alerts(); - my $secname = $alerts{'badsec'}.'\\n'.$alerts{'separate'}; + my $secname = $alerts{'badsec'}."\n".$alerts{'separate'}; my $secnone = $alerts{'reserved'}; + &js_escape(\$secname); + &js_escape(\$secnone); my $output = ' function validatePersonnelSections(formname,nextstate) { var badsectotal = 0; @@ -1526,8 +1573,9 @@ sub print_request_form { &Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles, \%cat_order,\@code_order); } - my ($storeresult,$result) = &print_request_outcome($dom,\@codetitles, - \@code_order,$instcredits); + my $lonhost = $r->dir_config('lonHostID'); + my ($storeresult,$result,$customized) = &print_request_outcome($r,$lonhost,$dom,\@codetitles, + \@code_order,$instcredits); $r->print($result); if (($storeresult eq 'ok') || ($storeresult eq 'created')) { if ($storeresult eq 'ok') { @@ -1536,10 +1584,14 @@ sub print_request_form { '<a href="/adm/requestcourse">'.&mt('Make another request').'</a></p>'); } if (&Apache::loncoursequeueadmin::author_prompt()) { - &print_author_prompt($r,$env{'form.action'},$env{'form.cnum'},$env{'form.showdom'}, - $env{'form.crstype'},$storeresult); + unless ($customized) { + &print_author_prompt($r,$env{'form.action'},$env{'form.cnum'},$env{'form.showdom'}, + $env{'form.crstype'},$storeresult); + } } elsif ($storeresult eq 'created') { - $r->print('<p><a href="/adm/requestcourse">'.&mt('Make another request').'</a></p>'); + unless ($customized) { + $r->print('<p><a href="/adm/requestcourse">'.&mt('Make another request').'</a></p>'); + } } } } elsif ($state eq 'reqauthor') { @@ -2373,8 +2425,9 @@ ENDJS } sub viewcancel_javascript { - my $alert = &mt('Are you sure you want to cancel this request?').'\\n'. + my $alert = &mt('Are you sure you want to cancel this request?')."\n". &mt('Your request will be removed.'); + &js_escape(\$alert); return << "ENDJS"; function nextPage(formname,nextstate) { if (confirm('$alert')) { @@ -2746,6 +2799,7 @@ sub print_review { my $enrollrow_title = &mt('Default Access Dates').'<br />'. '('.&Apache::lonnet::plaintext('st',$category).')'; + my $instcode; if ($env{'form.crstype'} eq 'official') { if ((ref($codetitles) eq 'ARRAY') && (ref($cat_titles) eq 'HASH')) { foreach my $title (@{$codetitles}) { @@ -2761,6 +2815,11 @@ sub print_review { } } } + if (ref($code_order) eq 'ARRAY') { + foreach my $item (@{$code_order}) { + $instcode .= $env{'form.instcode_'.$item}; + } + } $inst_headers .= '<th>'.&mt('Credits').'</th>'; if ($instcredits) { $inst_values .= '<td>'.$instcredits.'</td>'; @@ -2848,7 +2907,7 @@ sub print_review { ($env{'form.clonedom'} =~ /^$match_domain$/)) { my $canclone = &Apache::loncoursequeueadmin::can_clone_course($uname, $udom,$env{'form.clonecrs'},$env{'form.clonedom'}, - $env{'form.crstype'}); + $env{'form.crstype'},$dom,$instcode); if ($canclone) { my %courseenv = &Apache::lonnet::userenvironment($env{'form.clonedom'}, $env{'form.clonecrs'},('description','internal.coursecode')); @@ -3010,19 +3069,20 @@ sub dates_from_form { sub courseinfo_form { my ($dom,$formname,$crstype,$next,$description) = @_; - my %lt = &Apache::lonlocal::texthash( + my %js_lt = &Apache::lonlocal::texthash( official => 'You must provide a (brief) course description.', community => 'You must provide a (brief) community description.' ); - $lt{'unofficial'} = $lt{'official'}; - $lt{'textbook'} = $lt{'official'}; + &js_escape(\%js_lt); + $js_lt{'unofficial'} = $js_lt{'official'}; + $js_lt{'textbook'} = $js_lt{'official'}; my $js_validate = <<"ENDJS"; <script type="text/javascript"> // <![CDATA[' function validateForm() { if ((document.$formname.cdescr.value == "") || (document.$formname.cdescr.value == "undefined")) { - alert('$lt{$crstype}'); + alert('$js_lt{$crstype}'); return; } nextPage(document.$formname,'$next'); @@ -3335,7 +3395,7 @@ sub display_navbuttons { } sub print_request_outcome { - my ($dom,$codetitles,$code_order,$instcredits) = @_; + my ($r,$lonhost,$dom,$codetitles,$code_order,$instcredits) = @_; my ($output,$cnum,$now,$req_notifylist,$crstype,$enrollstart,$enrollend, %sections,%crosslistings,%personnel,@baduname,@missingdom,%domconfig, $uniquecode); @@ -3546,7 +3606,7 @@ sub print_request_outcome { my $canclone = &Apache::loncoursequeueadmin::can_clone_course($env{'user.name'}, $env{'user.domain'},$env{'form.clonecrs'},$env{'form.clonedom'}, - $crstype); + $crstype,$dom,$instcode); if ($canclone) { $clonecrs = $env{'form.clonecrs'}; $clonedom = $env{'form.clonedom'}; @@ -3580,14 +3640,15 @@ sub print_request_outcome { accessend => $accessend, personnel => \%personnel, }; - my ($result,$output) = &process_request($dom,$cnum,$crstype,$now,$details,$instcode, - $req_notifylist,\@instsections,\%domconfig); - return ($result,$output); + my ($result,$output,$customized) = &process_request($r,$lonhost,$dom,$cnum,$crstype,$now,$details, + $instcode,$req_notifylist,\@instsections,\%domconfig); + return ($result,$output,$customized); } sub process_request { - my ($dom,$cnum,$crstype,$now,$details,$instcode,$req_notifylist,$instsections,$domconfig) = @_; - my (@inststatuses,$storeresult,$creationresult,$output); + my ($r,$lonhost,$dom,$cnum,$crstype,$now,$details,$instcode,$req_notifylist,$instsections, + $domconfig) = @_; + my (@inststatuses,$storeresult,$creationresult,$output,$customized); my $val = &Apache::loncoursequeueadmin::get_processtype('course',$env{'user.name'}, $env{'user.domain'},$env{'user.adv'}, @@ -3606,7 +3667,7 @@ sub process_request { } $storeresult = 'notpermitted'; } else { - my ($disposition,$message,$reqstatus); + my ($disposition,$message,$reqstatus,$coursedesc,$accessstart,$accessend,%customvalidation); my %reqhash = ( reqtime => $now, crstype => $crstype, @@ -3614,6 +3675,13 @@ sub process_request { ); my $requestkey = $dom.'_'.$cnum; my $validationerror; + my $fullname = &Apache::loncommon::plainname($env{'user.name'}, + $env{'user.domain'}); + if (ref($details) eq 'HASH') { + $coursedesc = $details->{'cdescr'}; + $accessstart = $details->{'accessstart'}; + $accessend = $details->{'accessend'}; + } if ($val eq 'autolimit=') { $disposition = 'process'; } elsif ($val =~ /^autolimit=(\d+)$/) { @@ -3622,6 +3690,11 @@ sub process_request { $dom,$crstype,$limit,\$message); } elsif ($val eq 'validate') { my ($inststatuslist,$validationchk,$validation); + if (ref($details) eq 'HASH') { + if ($details->{'clonecrs'}) { + $customvalidation{'_LC_clonefrom'} = $details->{'clonedom'}.'_'.$details->{'clonecrs'}; + } + } if (@inststatuses > 0) { $inststatuslist = join(',',@inststatuses); } @@ -3631,10 +3704,18 @@ sub process_request { $instseclist = join(',',@{$instsections}); } } +# +# Retrieve any custom form information used for validation +# + my $preprocess = &Apache::lonnet::auto_crsreq_update($dom,$cnum,$crstype,'prevalidate',$env{'user.name'}, + $env{'user.domain'},$fullname,$coursedesc); + if (ref($preprocess) eq 'HASH') { + &custom_formitems($preprocess,\%customvalidation); + } $validationchk = &Apache::lonnet::auto_courserequest_validation($dom, $env{'user.name'}.':'.$env{'user.domain'},$crstype, - $inststatuslist,$instcode,$instseclist); + $inststatuslist,$instcode,$instseclist,\%customvalidation); if ($validationchk =~ /:/) { ($validation,$message) = split(':',$validationchk); } else { @@ -3651,29 +3732,18 @@ sub process_request { } $reqhash{'disposition'} = $disposition; $reqstatus = $disposition; - my ($modified,$queued,$coursedesc,%customitems); + my ($modified,$queued,$token,%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); + $env{'user.domain'},$fullname,$coursedesc,undef, + undef,undef,\%customvalidation); +# +# Retrieve any custom form information submitted with review page and include in request details. +# 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}; - } - } - } + &custom_formitems($inprocess,\%customitems); + foreach my $key (keys(%customitems)) { + $reqhash{'custom'}{$key} = $customitems{$key}; } } } @@ -3698,10 +3768,36 @@ sub process_request { foreach my $role (@roles) { $longroles{$role}=&Apache::lonnet::plaintext($role,$type); } + $r->print('<div id="processing" style="display:block;">'."\n". + &mt('Your request is being processed; this page will update when processing is complete.'). + '</div>'); + $r->rflush(); + if (ref($details) eq 'HASH') { + if ($details->{'clonecrs'}) { + $customitems{'_LC_clonefrom'} = $details->{'clonedom'}.'_'.$details->{'clonecrs'}; + } + } + $customitems{'_LC_ownerfullname'} = &Apache::loncommon::plainname($env{'user.name'},$env{'user.domain'},'first'); + my $owneremail; + my %emails = &Apache::loncommon::getemails(); + foreach my $email ('permanentemail','critnotification','notification') { + $owneremail = $emails{$email}; + last if ($owneremail ne ''); + } + if ($owneremail ne '') { + $customitems{'_LC_owneremail'} = $owneremail; + } + $customitems{'_LC_coursedomainname'} = &Apache::lonnet::domain($dom,'description'); + $customitems{'_LC_coursedescription'} = $coursedesc; + $customitems{'_LC_coursestartdate'} = $accessstart; + $customitems{'_LC_courseenddate'} = $accessend; my ($result,$postprocess) = &Apache::loncoursequeueadmin::course_creation($dom,$cnum, 'autocreate',$details,\$logmsg,\$newusermsg,\$addresult, \$enrollcount,\$response,\$keysmsg,\%domdefs,\%longroles, \$code,\%customitems); + if (ref($postprocess) eq 'HASH') { + $customized = $postprocess->{'createdcustomized'}; + } if ($result eq 'created') { $disposition = 'created'; $reqstatus = 'created'; @@ -3720,7 +3816,18 @@ sub process_request { if ($code) { $reqhash{'code'} = $code; } - $output .= '<br />'.$role_result.'</p>'; + if (ref($postprocess) eq 'HASH') { + if (ref($postprocess->{'createdactions'}) eq 'HASH') { + if (ref($postprocess->{'createdactions'}{'environment'}) eq 'HASH') { + &Apache::loncoursequeueadmin::postprocess_crsenv($dom,$cnum, + $postprocess->{'createdactions'}{'environment'}); + } + } + } + unless ($customized) { + $output .= '<br />'.$role_result; + } + $output .= '</p>'; $creationresult = 'created'; } else { $output = '<span class="LC_error">'; @@ -3742,7 +3849,8 @@ sub process_request { crstype => $crstype, ownername => $env{'user.name'}, ownerdom => $env{'user.domain'}, - description => $env{'form.cdescr'}, + description => $env{'form.cdescr'}, + lonhost => $lonhost, }, }; if ($crstype eq 'official') { @@ -3760,9 +3868,19 @@ sub process_request { if (($queuehash{$cnum.'_approval'} ne '') || ($queuehash{$cnum.'_pending'} ne '')) { $queued = 1; + if (ref($queuehash{$cnum.'_pending'}) eq 'HASH') { + $token = $queuehash{$cnum.'_pending'}{'token'}; + } } } unless ($queued) { + if (($disposition eq 'pending') && ($crstype ne 'official')) { + my %reqinfo = ( + $cnum.':'.$dom => $now.':'.$env{'user.name'}.':'.$env{'user.domain'}, + ); + $token = &Apache::lonnet::tmpput(\%reqinfo,$lonhost); + $request->{$requestid}->{'token'} = $token; + } my $putresult = &Apache::lonnet::newput_dom('courserequestqueue',$request, $dom); if ($putresult eq 'ok') { @@ -3771,9 +3889,11 @@ sub process_request { } else { $output .= &mt('Your course request has been recorded.') } - $output .= '<br />'. - ¬ification_information($disposition,$req_notifylist, - $dom,$cnum,$now); + unless ($disposition eq 'pending') { + $output .= '<br />'. + ¬ification_information($disposition,$req_notifylist, + $dom,$cnum,$now); + } } else { $reqstatus = 'domainerror'; $reqhash{'disposition'} = $disposition; @@ -3785,23 +3905,48 @@ sub process_request { ($storeresult,my $updateresult) = &Apache::loncoursequeueadmin::update_coursereq_status(\%reqhash,$dom, $cnum,$reqstatus,'request',$env{'user.domain'},$env{'user.name'}); - if ($modified && $queued && $storeresult eq 'ok') { - if ($crstype eq 'community') { - $output .= '<p>'.&mt('Your community request has been updated').'</p>'; - } else { - $output .= '<p>'.&mt('Your course request has been updated').'</p>'; - } - $output .= ¬ification_information($disposition,$req_notifylist,$dom,$cnum,$now); - if ($disposition eq 'approval') { + if ($storeresult eq 'ok') { + my $postprocess; + if (($disposition eq 'approval') || ($disposition eq 'pending')) { + my $updateaction = $disposition; + if ($disposition eq 'approval') { + $updateaction = 'queued'; + } 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'}, + $postprocess = + &Apache::lonnet::auto_crsreq_update($dom,$cnum,$crstype,$updateaction,$env{'user.name'}, $env{'user.domain'},$fullname,$env{'form.cdescr'}); + } + if ($modified && $queued) { + if ($crstype eq 'community') { + $output .= '<p>'.&mt('Your community request has been updated').'</p>'; + } else { + $output .= '<p>'.&mt('Your course request has been updated').'</p>'; + } + if ($disposition eq 'approval') { + $output .= ¬ification_information($disposition,$req_notifylist,$dom,$cnum,$now); + } + } + if ($disposition eq 'approval') { 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); + ¬ification_information($disposition,undef,$dom,$cnum,$now,undef,$postprocess); + $customized = $postprocess->{'createdcustomized'}; + } + } elsif ($disposition eq 'pending') { + my $pendingform; + if ($crstype ne 'official') { + $pendingform = &pending_validation_form($dom,$cnum,$crstype,$now,$token, + $lonhost,$env{'form.cdescr'}); + } + if ($pendingform) { + $output .= $pendingform; + } else { + $output .= ¬ification_information($disposition,undef,$dom,$cnum,$now,undef,$postprocess); + } + if (ref($postprocess) eq 'HASH') { + $customized = $postprocess->{'createdcustomized'}; } } } @@ -3813,9 +3958,34 @@ sub process_request { } } if ($creationresult ne '') { - return ($creationresult,$output); + return ($creationresult,$output,$customized); } else { - return ($storeresult,$output); + return ($storeresult,$output,$customized); + } +} + +sub custom_formitems { + my ($preprocess,$customhash) = @_; + return unless ((ref($preprocess) eq 'HASH') && (ref($customhash) eq 'HASH')); + if (ref($preprocess->{'formitems'}) eq 'HASH') { + foreach my $key (keys(%{$preprocess->{'formitems'}})) { + if ($preprocess->{'formitems'}->{$key} eq 'multiple') { + if (exists($env{'form.'.$key})) { + my @items = &Apache::loncommon::get_env_multiple($env{'form.'.$key}); + foreach my $item (@items) { + $item =~ s/(`)/'/g; + $item =~ s/\$/\(\$\)/g; + push(@{$customhash->{$key}},$item); + } + } + } else { + if (exists($env{'form.'.$key})) { + $customhash->{$key} = $env{'form.'.$key}; + $customhash->{$key} =~ s/(`)/'/g; + $customhash->{$key} =~ s/\$/\(\$\)/g; + } + } + } } } @@ -3994,7 +4164,7 @@ sub notification_information { if (scalar(@{$addmsg}) > 0) { &Apache::loncoursequeueadmin::send_selfserve_notification($recipient,$addmsg,undef, $env{'form.cdescr'},$now, - 'queuedreq',$sender); + 'queuedcrsreq',$sender); } } } @@ -4003,11 +4173,20 @@ sub notification_information { } } } elsif ($disposition eq 'pending') { - $output .= '<div class="LC_info">'. + my $pending_default = '<div class="LC_info">'. &mt('Your request has been placed in a queue pending administrative action.').'<br />'. &mt("Usually this means that your institution's information systems do not list you among the instructional personnel for this course.").'<br />'. &mt('The list of instructional personnel for the course will be automatically checked daily, and once you are listed the request will be processed.'). - '</div>'; + '</div>'; + if (ref($postprocess) eq 'HASH') { + if ($postprocess->{'pendingweb'}) { + $output .= $postprocess->{'pendingweb'}; + } else { + $output .= $pending_default; + } + } else { + $output .= $pending_default; + } } elsif ($disposition eq 'created') { if (($code) || ((ref($postprocess) eq 'HASH') && ((ref($postprocess->{'createdmsg'}) eq 'ARRAY') || ($postprocess->{'createdweb'})))) { @@ -4043,7 +4222,7 @@ sub notification_information { } } if (scalar(@{$addmsg}) > 0) { - my $type = 'createdreq'; + my $type = 'createdcrsreq'; if ($code) { $type = 'uniquecode'; } @@ -4059,6 +4238,53 @@ sub notification_information { return $output; } +sub pending_validation_form { + my ($cdom,$cnum,$crstype,$now,$token,$lonhost,$cdesc) = @_; + my $output; + my %postvalues = ( + 'owner' => $env{'user.name'}.':'.$env{'user.domain'}, + 'course' => $cdom.'_'.$cnum, + 'coursetype' => $crstype, + ); + my %domconfig = &Apache::lonnet::get_dom('configuration',['requestcourses'],$cdom); + + if (ref($domconfig{'requestcourses'}) eq 'HASH') { + my ($url,$buttontext,$code,@fields); + if (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') { + $postvalues{'description'} = $cdesc; + $url = $domconfig{'requestcourses'}{'validation'}{'url'}; + if (ref($domconfig{'requestcourses'}{'validation'}{'fields'}) eq 'ARRAY') { + @fields = @{$domconfig{'requestcourses'}{'validation'}{'fields'}}; + } + $buttontext = $domconfig{'requestcourses'}{'validation'}{'button'}; + $output .= $domconfig{'requestcourses'}{'validation'}{'markup'}; + if (($url =~ m{^(https?\://|/)}) && (@fields > 0)) { + $output .= '<form name="crsreqvalidation" action="'.$url.'" method="post">'."\n"; + foreach my $field (@fields) { + if ($postvalues{$field}) { + $output .= '<input type="hidden" name="'.$field.'" value="'.$postvalues{$field}.'" />'."\n"; + } + } + if ($buttontext eq '') { + if ($crstype eq 'community') { + $buttontext = &mt('Create community'); + } else { + $buttontext = &mt('Create course'); + } + } + my $protocol = $Apache::lonnet::protocol{$lonhost}; + $protocol = 'http' if ($protocol ne 'https'); + my $crscreator = $protocol.'://'.&Apache::lonnet::hostname($lonhost).'/cgi-bin/createpending.pl'; + $output .= '<input type="hidden" name="crscreator" value="'.$crscreator.'" />'."\n". + '<input type="hidden" name="token" value="'.$token.'" />'."\n". + '<input type="submit" name="validate" value="'.$buttontext.'" />'."\n". + '</form>'."\n"; + } + } + } + return $output; +} + sub check_autolimit { my ($uname,$udom,$dom,$crstype,$limit,$message) = @_; my %crsroles = &Apache::lonnet::get_my_roles($env{'user.name'},$env{'user.domain'}, @@ -4276,25 +4502,26 @@ sub generate_date_items { sub print_textbook_form { my ($r,$dom,$incdoms,$domdefs,$settings,$can_request) = @_; - my ($bookshash,%ordered); + my (%prefab,%ordered,%numprefab); my $crstype = 'textbook'; # -# Retrieve list of textbook courses cloneable by user +# Retrieve list of prefabricated courses (textbook courses and templates) 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') { + foreach my $type ('textbooks','templates') { + $numprefab{$type} = 0; + if (ref($settings) eq 'HASH') { + $prefab{$type} = $settings->{$type}; + if (ref($prefab{$type}) eq 'HASH') { + foreach my $item (keys(%{$prefab{$type}})) { 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 ++; + if (ref($prefab{$type}{$item}) eq 'HASH') { + if (&Apache::loncoursequeueadmin::can_clone_course($env{'user.name'}, + $env{'user.domain'},$clonecrs,$clonedom,$crstype,$dom)) { + + my $num = $prefab{$type}{$item}{'order'}; + $ordered{$type}{$num} = $item; + $numprefab{$type} ++; + } } } } @@ -4312,27 +4539,89 @@ sub print_textbook_form { } # -# Retrieve information about courses owned by user, or in which user has an active or future -# Course Coordinator role +# Retrieve information about courses owned by user, or in which user has an active +# Course Coordinator role # my $numcurrent; my %cloneable = &Apache::lonnet::courseiddump($dom,'.',1,'.',$env{'user.name'}.':'.$env{'user.domain'}, - undef,undef,undef,'Course'); + '.',undef,undef,'Course'); my %ccroles = &Apache::lonnet::get_my_roles($env{'user.name'},$env{'user.domain'},'userroles', - ['active','future'],['cc']); + ['active'],['cc']); + + my $cc_clone = ''; foreach my $role (keys(%ccroles)) { my ($cnum,$cdom,$rest) = split(/:/,$role,3); + $cc_clone .= $cdom.':'.$cnum.'&'; unless (exists($cloneable{$cdom.'_'.$cnum})) { my %courseinfo = &Apache::lonnet::coursedescription($cdom.'_'.$cnum,{'one_time' => 1}); - $cloneable{$cdom.'_'.$cnum} = \%courseinfo; + $cloneable{$cdom.'_'.$cnum} = { + context => $courseinfo{'internal.creationcontext'}, + created => $courseinfo{'internal.created'}, + creator => $courseinfo{'internal.creator'}, + description => $courseinfo{'description'}, + inst_code => $courseinfo{'coursecode'}, + owner => $courseinfo{'internal.courseowner'}, + releaserequired => $courseinfo{'internal.releaserequired'}, + type => $courseinfo{'type'}, + }; } } my $numcurrent = scalar(keys(%cloneable)); - my $jscript = &textbook_request_javascript($numbook,$numcurrent); +# +# Retrieve information about courses from user's domain which user can clone, but which not owned +# or cloneable based on Course Coordinator role. +# + my ($numdomcourses,%domcloneable); + my %allcloneable = &Apache::lonnet::courseiddump($dom,'.',1,'.','.','.',undef,undef,'Course', + undef,undef,undef,undef,undef, + $env{'user.name'}.':'.$env{'user.domain'}, + $cc_clone,1); + foreach my $cid (keys(%allcloneable)) { + unless (exists($cloneable{$cid})) { + $domcloneable{$cid} = $allcloneable{$cid}; + } + } + $numdomcourses = scalar(keys(%domcloneable)); + + my $fullname = &Apache::loncommon::plainname($env{'user.name'}, + $env{'user.domain'}); + +# +# Retrieve any custom form information prior to rendering page +# + + my $initprocess = &Apache::lonnet::auto_crsreq_update($dom,undef,$crstype,'initializereview',$env{'user.name'}, + $env{'user.domain'},$fullname); + my %custominit; + if (ref($initprocess) eq 'HASH') { + &custom_formitems($initprocess,\%custominit); + } + +# +# Retrieve any custom onload actions or javascript used for page before rendering +# + + my ($customonload,$customjs,$customvalidationjs); + my $inprocess = &Apache::lonnet::auto_crsreq_update($dom,undef,$crstype,'prereview',$env{'user.name'}, + $env{'user.domain'},$fullname,undef,undef, + undef,undef,\%custominit); + if (ref($inprocess) eq 'HASH') { + $customonload = $inprocess->{'onload'}; + $customjs = $inprocess->{'javascript'}; + $customvalidationjs = $inprocess->{'validationjs'}; + } + + my $postprocess = &Apache::lonnet::auto_crsreq_update($dom,undef,$crstype,'review', + $env{'user.name'}, + $env{'user.domain'},$fullname,undef,undef, + undef,undef,\%custominit); + + my $jscript = &textbook_request_javascript(\%numprefab,$numcurrent,$numdomcourses,$customvalidationjs); + $jscript .= $customjs; my %loaditems; - $loaditems{'onload'} = 'javascript:uncheckAllRadio();'; + $loaditems{'onload'} = 'javascript:uncheckAllRadio();'.$customonload; $r->print(&header('Course Request',$jscript,\%loaditems)); if (ref($can_request) eq 'HASH') { @@ -4377,19 +4666,31 @@ sub print_textbook_form { # # Content source selection, if more than one available # - if (keys(%cloneable) || keys(%ordered)) { + if (keys(%cloneable) || keys(%ordered) || keys(%domcloneable)) { $r->print('<div>'. '<fieldset><legend>'.&mt('Course Content').'</legend>'); if (keys(%ordered)) { - $r->print('<span class="LC_nobreak"><label>'. - '<input type="radio" name="cloning" value="textbook" onclick="javascript:cloneChoice();" />'. - &mt('Load textbook content').'</span>'.(' 'x2).' '); + if (ref($ordered{'textbooks'}) eq 'HASH') { + $r->print('<span class="LC_nobreak"><label>'. + '<input type="radio" name="cloning" value="textbook" onclick="javascript:cloneChoice();" />'. + &mt('Load textbook content').'</span>'.(' 'x2).' '); + } + if (ref($ordered{'templates'}) eq 'HASH') { + $r->print('<span class="LC_nobreak"><label>'. + '<input type="radio" name="cloning" value="template" onclick="javascript:cloneChoice();" />'. + &mt('Load pre-existing template').'</span>'.(' 'x2).' '); + } } if (keys(%cloneable)) { $r->print('<span class="LC_nobreak"><label>'. '<input type="radio" name="cloning" value="existing" onclick="javascript:cloneChoice();" />'. &mt('Copy one of your courses').'</label></span>'.(' 'x2).' '); } + if (keys(%domcloneable)) { + $r->print('<span class="LC_nobreak"><label>'. + '<input type="radio" name="cloning" value="colleague" onclick="javascript:cloneChoice();" />'. + &mt("Copy a colleague's course").'</label></span>'.(' 'x2).' '); + } $r->print('<span class="LC_nobreak"><label>'. '<input type="radio" name="cloning" value="none" checked="checked" onclick="javascript:cloneChoice();" />'. &mt('Empty course shell').'</label></span>'); @@ -4401,120 +4702,89 @@ sub print_textbook_form { # Table of cloneable textbook courses # if (keys(%ordered)) { - $r->print('<div id="showtextbook" style="display:none">'. - &Apache::loncommon::start_data_table(). - &Apache::loncommon::start_data_table_header_row(). - '<th>'.&mt('Title').'</th>'. - '<th>'.&mt('Author(s)').'</th>'. - '<th>'.&mt('Subject').'</th>'. - '<th>'.&mt('Book').'</th>'. - &Apache::loncommon::end_data_table_header_row()); - my @items = sort { $a <=> $b } keys(%ordered); - foreach my $num (@items) { - my $item = $ordered{$num}; - my $cleantitle=&HTML::Entities::encode($bookshash->{$item}->{'title'},'<>&"'); - $cleantitle=~s/'/\\'/g; - $cleantitle =~ s/^\s+//; - $r->print(&Apache::loncommon::start_data_table_row(). - '<td><label><input type="radio" name="book" value="'.$item.'" />'. - $cleantitle.'</label></td>'. - '<td>'.$bookshash->{$item}->{'author'}.'</td>'. - '<td>'.$bookshash->{$item}->{'subject'}.'</td>'. - '<td><img border="0" src="'.$bookshash->{$item}->{'image'}. - '" alt="'.$cleantitle.'" /></td>'. - &Apache::loncommon::end_data_table_row()); + foreach my $type ('textbooks','templates') { + my $divid = 'showtextbook'; + my $radioid = 'book'; + if ($type eq 'templates') { + $divid = 'showtemplate'; + $radioid = 'template'; + } + if (ref($ordered{$type}) eq 'HASH') { + $r->print('<div id="'.$divid.'" style="display:none">'. + &Apache::loncommon::start_data_table(). + &Apache::loncommon::start_data_table_header_row(). + '<th>'.&mt('Title').'</th>'); + if ($type eq 'textbooks') { + $r->print('<th>'.&mt('Author(s)').'</th>'); + } + $r->print('<th>'.&mt('Subject').'</th>'); + if ($type eq 'textbooks') { + $r->print('<th>'.&mt('Publisher').'</th>'. + '<th>'.&mt('Book').'</th>'); + } + $r->print(&Apache::loncommon::end_data_table_header_row()); + my @items = sort { $a <=> $b } keys(%{$ordered{$type}}); + foreach my $num (@items) { + my $item = $ordered{$type}{$num}; + my $cleantitle=&HTML::Entities::encode($prefab{$type}{$item}{'title'},'<>&"'); + $cleantitle=~s/'/\\'/g; + $cleantitle =~ s/^\s+//; + $r->print(&Apache::loncommon::start_data_table_row(). + '<td><label><input type="radio" name="'.$radioid.'" value="'.$item.'" />'. + $cleantitle.'</label></td>'); + if ($type eq 'textbooks') { + $r->print('<td>'.$prefab{$type}{$item}{'author'}.'</td>'); + } + $r->print('<td>'.$prefab{$type}{$item}{'subject'}.'</td>'); + if ($type eq 'textbooks') { + $r->print('<td>'.$prefab{$type}{$item}{'publisher'}.'</td>'. + '<td><img border="0" src="'.$prefab{$type}{$item}{'image'}. + '" alt="'.$cleantitle.'" /></td>'); + } + $r->print(&Apache::loncommon::end_data_table_row()); + } + $r->print(&Apache::loncommon::end_data_table(). + '</div>'); + } } - $r->print(&Apache::loncommon::end_data_table(). - '</div>'); } # # Table of user's current courses (owner and/or course coordinator) # + my %lt = &clone_text(); if (keys(%cloneable)) { - my %lt = &clone_text(); $r->print('<div id="showexisting" style="display:none">'. - &Apache::loncommon::start_data_table(). - &Apache::loncommon::start_data_table_header_row(). - '<th>'.&mt('Title').'</th>'. - '<th>'.&mt('Owner/co-owner(s)').'</th>'. - &Apache::loncommon::end_data_table_header_row()); - my %allownernames; - my %sortbytitle; - foreach my $cid (sort(keys(%cloneable))) { - if (ref($cloneable{$cid}) eq 'HASH') { - my $cdesc = $cloneable{$cid}{'description'}; - $cdesc =~ s/`/'/g; - if ($cdesc ne '') { - push(@{$sortbytitle{$cdesc}},$cid); - } - } - } - foreach my $title (sort(keys(%sortbytitle))) { - if (ref($sortbytitle{$title}) eq 'ARRAY') { - foreach my $cid (sort(@{$sortbytitle{$title}})) { - my $cleantitle=&HTML::Entities::encode($title,'<>&"'); - $cleantitle=~s/'/\\'/g; - $cleantitle =~ s/^\s+//; - my ($namestr,@owners,%ownernames); - my $singleowner = $cloneable{$cid}{'internal.courseowner'}; - push(@owners,$singleowner); - if ($cloneable{$cid}{'co-owners'} ne '') { - foreach my $item (split(/,/,$cloneable{$cid}{'internal.co-owners'})) { - push(@owners,$item); - } - } - foreach my $owner (@owners) { - my ($ownername,$ownerdom); - if ($owner =~ /:/) { - ($ownername,$ownerdom) = split(/:/,$owner); - } else { - $ownername = $owner; - if ($owner ne '') { - $ownerdom = $dom; - } - } - if ($ownername ne '' && $ownerdom ne '') { - if (exists($allownernames{$ownername.':'.$ownerdom})) { - $ownernames{$ownername.':'.$ownerdom} = $allownernames{$ownername.':'.$ownerdom}; - } else { - my %namehash=&Apache::loncommon::getnames($ownername,$ownerdom); - $ownernames{$ownername.':'.$ownerdom} = \%namehash; - $allownernames{$ownername.':'.$ownerdom} = $ownernames{$ownername.':'.$ownerdom}; - } - } - } - my @lastnames; - foreach my $owner (keys(%ownernames)) { - if (ref($ownernames{$owner}) eq 'HASH') { - push(@lastnames,$ownernames{$owner}{'lastname'}); - } - } - if (@lastnames) { - $namestr = join(', ',sort(@lastnames)); - } - $r->print(&Apache::loncommon::start_data_table_row(). - '<td><label><input type="radio" name="owned" value="'.$cid.'" />'. - ' '.$cleantitle.'</label></td>'. - '<td>'.$namestr.'</td>'. - &Apache::loncommon::end_data_table_row()); - } - } - } - $r->print(&Apache::loncommon::end_data_table(). - '<p><input type="radio" name="datemode" value="delete" /> '.$lt{'ncd'}. - '</label><br /><label>'. - '<input type="radio" name="datemode" value="preserve" /> '.$lt{'prd'}. - '</label><br /><label>'. - '<input type="radio" name="datemode" value="shift" checked="checked" /> '. - $lt{'shd'}.'</label>'. - '<input type="text" size="5" name="dateshift" value="365" />'. - '</div>'); + &clone_selection_table($dom,'owned',\%cloneable). + '<p><input type="radio" name="owndatemode" value="delete" /> '.$lt{'ncd'}. + '</label><br /><label>'. + '<input type="radio" name="owndatemode" value="preserve" /> '.$lt{'prd'}. + '</label><br /><label>'. + '<input type="radio" name="owndatemode" value="shift" checked="checked" /> '. + $lt{'shd'}.'</label>'. + '<input type="text" size="5" name="owndateshift" value="365" />'. + '</div>'); } # +# Table of other cloneable courses from user's domain (exclude own courses) +# + if (keys(%domcloneable)) { + $r->print('<div id="showcolleague" style="display:none">'. + &clone_selection_table($dom,'colleague',\%domcloneable). + '<p><input type="radio" name="colldatemode" value="delete" /> '.$lt{'ncd'}. + '</label><br /><label>'. + '<input type="radio" name="colldatemode" value="preserve" /> '.$lt{'prd'}. + '</label><br /><label>'. + '<input type="radio" name="colldatemode" value="shift" checked="checked" /> '. + $lt{'shd'}.'</label>'. + '<input type="text" size="5" name="colldateshift" value="365" />'. + '</div>'); + } + +# # End of content selector # - if (keys(%cloneable) || keys(%ordered)) { + if (keys(%cloneable) || keys(%domcloneable) || keys(%ordered)) { $r->print('</fieldset></div>'); } @@ -4545,11 +4815,6 @@ sub print_textbook_form { # # 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'}); @@ -4572,6 +4837,87 @@ sub print_textbook_form { return; } +sub clone_selection_table { + my ($dom,$name,$cloneableref) = @_; + return unless ((ref($cloneableref) eq 'HASH') && (($name eq 'owned') || ($name eq 'colleague'))); + my %allownernames; + my %sortbytitle; + my $output; + foreach my $cid (sort(keys(%{$cloneableref}))) { + if (ref($cloneableref->{$cid}) eq 'HASH') { + my $cdesc = $cloneableref->{$cid}{'description'}; + $cdesc =~ s/`/'/g; + if ($cdesc ne '') { + push(@{$sortbytitle{$cdesc}},$cid); + } + } + } + foreach my $title (sort(keys(%sortbytitle))) { + if (ref($sortbytitle{$title}) eq 'ARRAY') { + foreach my $cid (sort(@{$sortbytitle{$title}})) { + my $cleantitle=&HTML::Entities::encode($title,'<>&"'); + $cleantitle=~s/'/\\'/g; + $cleantitle =~ s/^\s+//; + my ($namestr,@owners,%ownernames); + if ($cloneableref->{$cid}{'owner'} ne '') { + push(@owners,$cloneableref->{$cid}{'owner'}); + } + if ($cloneableref->{$cid}{'co-owners'} ne '') { + foreach my $item (split(/,/,$cloneableref->{$cid}{'co-owners'})) { + if (($item ne '') && (!grep(/^\Q$item\E$/,@owners))) { + push(@owners,$item); + } + } + } + foreach my $owner (@owners) { + my ($ownername,$ownerdom); + if ($owner =~ /:/) { + ($ownername,$ownerdom) = split(/:/,$owner); + } else { + $ownername = $owner; + if ($owner ne '') { + $ownerdom = $dom; + } + } + if ($ownername ne '' && $ownerdom ne '') { + if (exists($allownernames{$ownername.':'.$ownerdom})) { + $ownernames{$ownername.':'.$ownerdom} = $allownernames{$ownername.':'.$ownerdom}; + } else { + my %namehash=&Apache::loncommon::getnames($ownername,$ownerdom); + $ownernames{$ownername.':'.$ownerdom} = \%namehash; + $allownernames{$ownername.':'.$ownerdom} = $ownernames{$ownername.':'.$ownerdom}; + } + } + } + my @lastnames; + foreach my $owner (keys(%ownernames)) { + if (ref($ownernames{$owner}) eq 'HASH') { + push(@lastnames,$ownernames{$owner}{'lastname'}); + } + } + if (@lastnames) { + $namestr = join(', ',sort(@lastnames)); + } + $output .= &Apache::loncommon::start_data_table_row(). + '<td><label><input type="radio" name="'.$name.'" value="'.$cid.'" />'. + ' '.$cleantitle.'</label></td>'. + '<td>'.$namestr.'</td>'. + &Apache::loncommon::end_data_table_row(); + } + } + } + if ($output) { + return &Apache::loncommon::start_data_table(). + &Apache::loncommon::start_data_table_header_row(). + '<th>'.&mt('Title').'</th>'. + '<th>'.&mt('Owner/co-owner(s)').'</th>'. + &Apache::loncommon::end_data_table_header_row(). + $output. + &Apache::loncommon::end_data_table(); + } + return; +} + sub process_textbook_request { my ($r,$dom,$action,$domdefs,$domconfig,$can_request) = @_; my ($uniquecode,$req_notifylist); @@ -4586,7 +4932,6 @@ sub process_textbook_request { } } } - my $crstype = 'textbook'; my $now = time; my $reqtype = $env{'form.cloning'}; my (@inststatuses,$storeresult,$creationresult); @@ -4594,8 +4939,12 @@ sub process_textbook_request { my ($clonefrom,$clonedom,$clonecrs); if ($reqtype eq 'textbook') { $clonefrom = $env{'form.book'}; + } elsif ($reqtype eq 'template') { + $clonefrom = $env{'form.template'}; } elsif ($reqtype eq 'existing') { $clonefrom = $env{'form.owned'}; + } elsif ($reqtype eq 'colleague') { + $clonefrom = $env{'form.colleague'}; } my ($accessstart,$accessend) = &dates_from_form('accessstart','accessend'); if ($clonefrom) { @@ -4603,7 +4952,7 @@ sub process_textbook_request { if (&Apache::lonnet::homeserver($clonecrs,$clonedom) ne 'no_host') { my $canclone = &Apache::loncoursequeueadmin::can_clone_course($env{'user.name'}, - $env{'user.domain'},$clonecrs,$clonedom,$crstype); + $env{'user.domain'},$clonecrs,$clonedom,$crstype,$dom); unless ($canclone) { undef($clonecrs); undef($clonedom); @@ -4613,7 +4962,11 @@ sub process_textbook_request { undef($clonedom); } } - $r->print(&header('Course Creation')); + my $js = &processing_javascript(); + my $loaditems = { + onload => 'javascript:hideProcessing();', + }; + $r->print(&header('Course Creation',$js,$loaditems)); if (ref($can_request) eq 'HASH') { unless ((scalar(keys(%{$can_request})) == 1) && ($can_request->{'textbook'})) { @@ -4647,37 +5000,67 @@ sub process_textbook_request { accessend => $accessend, personnel => {}, }; - if ($reqtype eq 'existing') { - $details->{datemode} = $env{'form.datemode'}; - $details->{dateshift} = $env{'form.dateshift'}; + if (($clonecrs ne '') && ($clonedom ne '')) { + if ($reqtype eq 'existing') { + $details->{datemode} = $env{'form.owndatemode'}; + if ($details->{datemode} eq 'shift') { + $details->{dateshift} = $env{'form.owndateshift'}; + } else { + $details->{dateshift} = ''; + } + } elsif ($reqtype eq 'colleague') { + $details->{datemode} = $env{'form.colldatemode'}; + if ($details->{datemode} eq 'shift') { + $details->{dateshift} = $env{'form.colldateshift'}; + } else { + $details->{dateshift} = ''; + } + } + if ($details->{dateshift} ne '') { + $details->{dateshift} =~ s/[^\d\.]+//g; + } + } else { + $details->{datemode} = ''; + $details->{dateshift} = ''; } - my ($result,$output) = &process_request($dom,$cnum,$crstype,$now,$details,'',$req_notifylist,[],$domconfig); + my $lonhost = $r->dir_config('lonHostID'); + $r->rflush(); + my ($result,$output,$customized) = &process_request($r,$lonhost,$dom,$cnum,$crstype,$now,$details, + '',$req_notifylist,[],$domconfig); $r->print($output); if (&Apache::loncoursequeueadmin::author_prompt()) { - &print_author_prompt($r,$action,$cnum,$dom,$crstype,$result); + unless ($customized) { + &print_author_prompt($r,$action,$cnum,$dom,$crstype,$result); + } } elsif ($result eq 'created') { - $r->print('<p><a href="/adm/requestcourse">'.&mt('Create another course').'</a></p>'); + unless ($customized) { + $r->print('<p><a href="/adm/requestcourse">'.&mt('Create another course').'</a></p>'); + } } &endContentScreen($r); $r->print(&Apache::loncommon::end_page()); } sub textbook_request_javascript { - my ($numbook,$numcurrent) = @_; - my %lt = &Apache::lonlocal::texthash( - choose => 'Please select a content option.', - textbook => 'Please select a textbook, or choose a different option.', - existing => 'Please select one of your existing courses to copy, or choose a different option.', - title => 'Please enter a course title.', + my ($numprefab,$numcurrent,$numcolleague,$customvalidationjs) = @_; + return unless (ref($numprefab) eq 'HASH'); + return if (!$numprefab->{'textbooks'} && !$numprefab->{'templates'} && !$numcurrent && !$numcolleague); + my %js_lt = &Apache::lonlocal::texthash( + choose => 'Please select a content option.', + textbook => 'Please select a textbook, or choose a different option.', + template => 'Please select a template, or choose a different option.', + existing => 'Please select one of your existing courses to copy, or choose a different option.', + colleague => "Please select a colleague's course to copy, or choose a different option.", + title => 'Please enter a course title.', ); - return if (!$numbook && !$numcurrent); + &js_escape(\%js_lt); return <<"ENDSCRIPT"; function cloneChoice() { if (document.requestcourse.cloning) { var radioLength = document.requestcourse.cloning.length; if (radioLength == undefined) { var val = document.requestcourse.cloning.value; - if ((val == 'textbook') || (val == 'existing')) { + if ((val == 'textbook') || (val == 'template') || (val == 'existing') || (val == 'colleague')) { var elem = document.getElementById('show'+val); if (document.requestcourse.cloning.checked) { elem.style.display = 'block'; @@ -4689,7 +5072,7 @@ function cloneChoice() { } else { for (var i=0; i<radioLength; i++) { var val = document.requestcourse.cloning[i].value; - if ((val == 'textbook') || (val == 'existing')) { + if ((val == 'textbook') || (val == 'template') || (val == 'existing') || (val == 'colleague')) { var elem = document.getElementById('show'+val); if (document.requestcourse.cloning[i].checked) { elem.style.display = 'block'; @@ -4697,9 +5080,15 @@ function cloneChoice() { if (val == 'textbook') { uncheckRadio('book'); } + if (val == 'template') { + uncheckRadio('template'); + } if (val == 'existing') { uncheckRadio('owned'); } + if (val == 'colleague') { + uncheckRadio('colleague'); + } elem.style.display = 'none'; } } @@ -4724,14 +5113,22 @@ function uncheckRadio(radioGroupName) { function uncheckAllRadio() { uncheckRadio('cloning'); - var numbook = $numbook; + var numbook = $numprefab->{'textbooks'}; + var numtemplate = $numprefab->{'templates'}; var numcurrent = $numcurrent; + var numcolleague = $numcolleague; if (numbook > 0) { uncheckRadio('textbook'); } + if (numtemplate > 0) { + uncheckRadio('template'); + } if (numcurrent > 0) { uncheckRadio('existing'); } + if (numcolleague > 0) { + uncheckRadio('colleague'); + } return; } @@ -4741,7 +5138,7 @@ function validTextbookReq() { var radioLength = document.requestcourse.cloning.length; if (radioLength == undefined) { if (document.requestcourse.cloning.checked == false) { - alert("$lt{'choose'}"); + alert("$js_lt{'choose'}"); return false; } else { cloneChoice = document.requestcourse.cloning.value; @@ -4754,17 +5151,25 @@ function validTextbookReq() { } } if (cloneChoice == 0) { - alert("$lt{'choose'}"); + alert("$js_lt{'choose'}"); return false; } } var group; - if ((cloneChoice == 'textbook') || (cloneChoice == 'existing')) { + if ((cloneChoice == 'textbook') || (cloneChoice == 'template') || (cloneChoice == 'existing') || (cloneChoice == 'colleague')) { var group; if (cloneChoice == 'textbook') { group = document.getElementsByName('book'); } else { - group = document.getElementsByName('owned'); + if (cloneChoice == 'template') { + group = document.getElementsByName('template'); + } else { + if (cloneChoice == 'existing') { + group = document.getElementsByName('owned'); + } else { + group = document.getElementsByName('colleague'); + } + } } var groupLength = group.length; var chosen = 0; @@ -4782,18 +5187,27 @@ function validTextbookReq() { } if (chosen == 0) { if (cloneChoice == 'textbook') { - alert("$lt{'textbook'}"); + alert("$js_lt{'textbook'}"); } else { - alert("$lt{'existing'}"); + if (cloneChoice == 'template') { + alert("$js_lt{'template'}"); + } else { + if (cloneChoice == 'existing') { + alert("$js_lt{'existing'}"); + } else { + alert("$js_lt{'colleague'}"); + } + } } return false; } } } if (document.requestcourse.cdescr.value == '') { - alert("$lt{'title'}"); + alert("$js_lt{'title'}"); return false; } + $customvalidationjs return true; } @@ -4801,6 +5215,33 @@ ENDSCRIPT } +sub textbook_request_disabled { + my ($r,$dom,$action,$can_request) = @_; + if (ref($can_request) eq 'HASH') { + if ($action eq 'process') { + unless ((scalar(keys(%{$can_request})) == 1)) { + &Apache::lonhtmlcommon::add_breadcrumb( + { href => '/adm/requestcourse', + text => 'Pick action', + }); + } + } + } + $r->print(&header('Course Request')); + &Apache::lonhtmlcommon::add_breadcrumb({text=>'Course Request'}); + $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course Requests','Course_Requests'). + '<div>'. + '<p class="LC_info">'.&mt('You do not have privileges to request creation of textbook courses.').'</p>'); + if (ref($can_request) eq 'HASH') { + if (scalar(keys(%{$can_request})) > 1) { + $r->print('<a href="/adm/requestcourse">'.&mt('Go back').'</a>'); + } + } + $r->print('</div>'. + &Apache::loncommon::end_page()); + return; +} + sub startContentScreen { my ($r,$mode)=@_; $r->print("\n".'<ul class="LC_TabContentBigger" id="textbookreq">'."\n");