--- loncom/interface/lonrequestcourse.pm 2015/06/09 21:22:57 1.89 +++ loncom/interface/lonrequestcourse.pm 2024/07/03 22:34:22 1.95.2.8 @@ -1,7 +1,7 @@ # The LearningOnline Network # Request a course # -# $Id: lonrequestcourse.pm,v 1.89 2015/06/09 21:22:57 damieng Exp $ +# $Id: lonrequestcourse.pm,v 1.95.2.8 2024/07/03 22:34:22 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -119,6 +119,10 @@ use Apache::loncoursequeueadmin; use Apache::lonuserutils; use LONCAPA qw(:DEFAULT :match); +my $registered_flush; +my $registered_instcats; +my $modified_dom; + sub handler { my ($r) = @_; &Apache::loncommon::content_type($r,'text/html'); @@ -127,6 +131,10 @@ sub handler { return OK; } + $registered_flush = 0; + $registered_instcats = 0; + $modified_dom = ''; + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['action','showdom','cnum','state','crstype','queue','tabs']); &Apache::lonhtmlcommon::clear_breadcrumbs(); @@ -311,8 +319,6 @@ sub handler { $jscript = &Apache::lonhtmlcommon::set_form_elements($elementsref,\%stored); if ($state eq 'courseinfo') { $jscript .= &cloning_javascript(); - } elsif ($state eq 'process') { - $jscript .= &processing_javascript(); } } } @@ -424,17 +430,6 @@ 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); @@ -712,9 +707,6 @@ sub onload_action { if ($state eq 'courseinfo') { $loaditems{'onload'} .= 'javascript:setCloneDisplay(document.requestcrs);'; } - if ($state eq 'process') { - $loaditems{'onload'} .= 'javascript:hideProcessing();'; - } } return \%loaditems; } @@ -1574,8 +1566,8 @@ sub print_request_form { \%cat_order,\@code_order); } my $lonhost = $r->dir_config('lonHostID'); - my ($storeresult,$result) = &print_request_outcome($r,$lonhost,$dom,\@codetitles, - \@code_order,$instcredits); + 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') { @@ -1584,10 +1576,14 @@ sub print_request_form { ''.&mt('Make another request').'

'); } 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('

'.&mt('Make another request').'

'); + unless ($customized) { + $r->print('

'.&mt('Make another request').'

'); + } } } } elsif ($state eq 'reqauthor') { @@ -2093,6 +2089,18 @@ sub print_personnel_menu { $output .= &Apache::lonhtmlcommon::row_headline(). '

'.&Apache::loncommon::help_open_topic('Course_Request_Personnel').' '.$lt{$crstype}.' '.&mt('Include other personnel?').'

'; } + my $cansearch = 1; + my @alldoms = &Apache::lonnet::all_domains(); + if (@alldoms == 1) { + my %domsrch = &Apache::lonnet::get_dom('configuration', + ['directorysrch'],$alldoms[0]); + if (ref($domsrch{'directorysrch'}) eq 'HASH') { + if ((!$domsrch{'directorysrch'}{'available'}) && + ($domsrch{'directorysrch'}{'lcavailable'} eq '0')) { + $cansearch = 0; + } + } + } for (my $i=0; $i<$persontotal; $i++) { my @linkargs = map { 'person_'.$i.'_'.$_ } (@items); my $linkargstr = join("','",@linkargs); @@ -2117,9 +2125,14 @@ sub print_personnel_menu { } $sectionselector .= $newtitle. ''."\n"; - my $usersrchlinktxt = &mt('Search for user'); - my $usersrchlink = &Apache::loncommon::selectuser_link($formname,@linkargs,$dom, - $usersrchlinktxt); + my $usersrchlink; + if ($cansearch) { + my $usersrchlinktxt = &mt('Search for user'); + $usersrchlink = &Apache::loncommon::selectuser_link($formname,@linkargs,$dom, + $usersrchlinktxt); + } else { + $usersrchlink = ' '; + } my $userchklinktxt = &mt('Check username'); my $userchklink = &Apache::loncommon::selectuser_link($formname,@linkargs,$dom, $userchklinktxt,'checkusername'); @@ -2366,7 +2379,7 @@ sub print_cancel_request { &Apache::loncommon::start_data_table_row(). ''.$history{details}{'cdescr'}.''. &Apache::lonlocal::locallocaltime($timestamp).''. - ''.$showtype.''. + ''.&mt($showtype).''. &Apache::loncommon::end_data_table_row(). &Apache::loncommon::end_data_table(). '
'; @@ -2720,7 +2733,7 @@ sub requestlog_display_filter { $typename = $typenames->{$crstype}; } } - $output .= ''."\n"; + $output .= ''."\n"; } $output .= ''; } @@ -3158,7 +3171,7 @@ sub clone_form { &Apache::loncommon::select_dom_form($dom,'clonedom').''. &Apache::lonhtmlcommon::row_closure(1). &Apache::lonhtmlcommon::row_title($lt{'cid'}).' '. &Apache::loncommon::selectcourse_link($formname,'clonecrs','clonedom','','','',$type). &Apache::lonhtmlcommon::row_closure(1). @@ -3169,7 +3182,7 @@ sub clone_form { '
'. - ''. + ''. &Apache::lonhtmlcommon::row_closure(1); return $output; } @@ -3208,7 +3221,7 @@ sub coursecode_form { } if (@{$codetitles} > 0) { my $lastitem = pop(@{$codetitles}); - my $lastinput = ''; + my $lastinput = ''; if (@{$codetitles} > 0) { my $helplink; if (defined($helpitem{$context})) { @@ -3609,6 +3622,19 @@ sub print_request_outcome { } } } + if ($env{'form.chome'} eq 'default') { + my %servers = &Apache::lonnet::get_servers($dom,'library'); + my $numlib = keys(%servers); + if ($numlib) { + my $loadm=10000000; + my $chome; + foreach my $tryserver (keys(%servers)) { + ($chome,$loadm) = + &Apache::lonnet::compare_server_load($tryserver,$chome,$loadm); + } + $env{'form.chome'} = $chome; + } + } my $details = { owner => $env{'user.name'}, domain => $env{'user.domain'}, @@ -3636,15 +3662,15 @@ sub print_request_outcome { accessend => $accessend, personnel => \%personnel, }; - my ($result,$output) = &process_request($r,$lonhost,$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 ($r,$lonhost,$dom,$cnum,$crstype,$now,$details,$instcode,$req_notifylist,$instsections, $domconfig) = @_; - my (@inststatuses,$storeresult,$creationresult,$output); + my (@inststatuses,$storeresult,$creationresult,$output,$customized); my $val = &Apache::loncoursequeueadmin::get_processtype('course',$env{'user.name'}, $env{'user.domain'},$env{'user.adv'}, @@ -3663,7 +3689,7 @@ sub process_request { } $storeresult = 'notpermitted'; } else { - my ($disposition,$message,$reqstatus,$coursedesc); + my ($disposition,$message,$reqstatus,$coursedesc,$accessstart,$accessend,%customvalidation); my %reqhash = ( reqtime => $now, crstype => $crstype, @@ -3675,6 +3701,8 @@ sub process_request { $env{'user.domain'}); if (ref($details) eq 'HASH') { $coursedesc = $details->{'cdescr'}; + $accessstart = $details->{'accessstart'}; + $accessend = $details->{'accessend'}; } if ($val eq 'autolimit=') { $disposition = 'process'; @@ -3683,10 +3711,10 @@ sub process_request { $disposition = &check_autolimit($env{'user.name'},$env{'user.domain'}, $dom,$crstype,$limit,\$message); } elsif ($val eq 'validate') { - my ($inststatuslist,$validationchk,$validation,%custominfo); + my ($inststatuslist,$validationchk,$validation); if (ref($details) eq 'HASH') { if ($details->{'clonecrs'}) { - $custominfo{'_LC_clonefrom'} = $details->{'clonedom'}.'_'.$details->{'clonecrs'}; + $customvalidation{'_LC_clonefrom'} = $details->{'clonedom'}.'_'.$details->{'clonecrs'}; } } if (@inststatuses > 0) { @@ -3698,27 +3726,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') { - if (ref($preprocess->{'formitems'}) eq 'HASH') { - foreach my $key (keys(%{$preprocess->{'formitems'}})) { - if ($preprocess->{'formitems'}->{$key} eq 'multiple') { - if (exists($env{'form.'.$key})) { - @{$custominfo{$key}} = &Apache::loncommon::get_env_multiple($env{'form.'.$key}); - } - } else { - if (exists($env{'form.'.$key})) { - $custominfo{$key} = $env{'form.'.$key}; - } - } - } - } + &custom_formitems($preprocess,\%customvalidation); } $validationchk = &Apache::lonnet::auto_courserequest_validation($dom, $env{'user.name'}.':'.$env{'user.domain'},$crstype, - $inststatuslist,$instcode,$instseclist,\%custominfo); + $inststatuslist,$instcode,$instseclist,\%customvalidation); if ($validationchk =~ /:/) { ($validation,$message) = split(':',$validationchk); } else { @@ -3735,24 +3754,18 @@ sub process_request { } $reqhash{'disposition'} = $disposition; $reqstatus = $disposition; - my ($modified,$queued,$coursedesc,$token,%customitems); + my ($modified,$queued,$token,%customitems); unless ($disposition eq 'rejected') { 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}; } } } @@ -3777,19 +3790,49 @@ sub process_request { foreach my $role (@roles) { $longroles{$role}=&Apache::lonnet::plaintext($role,$type); } - $r->print('
'."\n". - &mt('Your request is being processed; this page will update when processing is complete.'). - '
'); + my $preamble = '
'. + '
'. + &mt("Please be patient while your request is processed"). + '
'. + '
'; + my $closure = < +// + +ENDCLOSE + my %prog_state = &Apache::lonhtmlcommon::Create_PrgWin($r,undef,$preamble); + &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Processing ...')); $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); + &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Finished!')); + &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); + if (ref($postprocess) eq 'HASH') { + $customized = $postprocess->{'createdcustomized'}; + } if ($result eq 'created') { $disposition = 'created'; $reqstatus = 'created'; @@ -3816,8 +3859,29 @@ sub process_request { } } } - $output .= '
'.$role_result.'

'; + unless ($customized) { + $output .= '
'.$role_result; + } + $output .= '

'; $creationresult = 'created'; + # Flush the course logs so reverse user roles immediately updated + unless ($registered_flush) { + my $handlers = $r->get_handlers('PerlCleanupHandler'); + $r->set_handlers('PerlCleanupHandler' => [\&Apache::lonnet::flushcourselogs,@{$handlers}]); + $registered_flush=1; + } + if ($instcode ne '') { + &Apache::lonnet::devalidate_cache_new('instcats',$dom); + # Update cache of self-cataloging courses on institution's server(s). + if (&Apache::lonnet::shared_institution($dom)) { + unless ($registered_instcats) { + my $handlers = $r->get_handlers('PerlCleanupHandler'); + $r->set_handlers('PerlCleanupHandler' => [\&devalidate_remote_instcats,@{$handlers}]); + $registered_instcats=1; + $modified_dom = $dom; + } + } + } } else { $output = ''; if ($crstype eq 'community') { @@ -3921,11 +3985,12 @@ sub process_request { if ((ref($postprocess) eq 'HASH') && ((ref($postprocess->{'queuedmsg'}) eq 'HASH') || ($postprocess->{'queuedweb'}))) { ¬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, + $pendingform = &pending_validation_form($r,$dom,$cnum,$crstype,$now,$token, $lonhost,$env{'form.cdescr'}); } if ($pendingform) { @@ -3933,6 +3998,9 @@ sub process_request { } else { $output .= ¬ification_information($disposition,undef,$dom,$cnum,$now,undef,$postprocess); } + if (ref($postprocess) eq 'HASH') { + $customized = $postprocess->{'createdcustomized'}; + } } } if ($validationerror ne '') { @@ -3943,9 +4011,50 @@ sub process_request { } } if ($creationresult ne '') { - return ($creationresult,$output); + return ($creationresult,$output,$customized); } else { - return ($storeresult,$output); + return ($storeresult,$output,$customized); + } +} + +sub devalidate_remote_instcats { + if ($modified_dom ne '') { + my %servers = &Apache::lonnet::internet_dom_servers($modified_dom); + my %thismachine; + map { $thismachine{$_} = 1; } &Apache::lonnet::current_machine_ids(); + if (keys(%servers)) { + foreach my $server (keys(%servers)) { + next if ($thismachine{$server}); + &Apache::lonnet::remote_devalidate_cache($server,['instcats:'.$modified_dom]); + } + } + $modified_dom = ''; + } + return; +} + +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; + } + } + } } } @@ -4199,7 +4308,7 @@ sub notification_information { } sub pending_validation_form { - my ($cdom,$cnum,$crstype,$now,$token,$lonhost,$cdesc) = @_; + my ($r,$cdom,$cnum,$crstype,$now,$token,$lonhost,$cdesc) = @_; my $output; my %postvalues = ( 'owner' => $env{'user.name'}.':'.$env{'user.domain'}, @@ -4232,9 +4341,12 @@ sub pending_validation_form { $buttontext = &mt('Create course'); } } + my $hostname = &Apache::lonnet::hostname($lonhost); my $protocol = $Apache::lonnet::protocol{$lonhost}; $protocol = 'http' if ($protocol ne 'https'); - my $crscreator = $protocol.'://'.&Apache::lonnet::hostname($lonhost).'/cgi-bin/createpending.pl'; + my $alias = &Apache::lonnet::use_proxy_alias($r,$lonhost); + $hostname = $alias if ($alias ne ''); + my $crscreator = $protocol.'://'.$hostname.'/cgi-bin/createpending.pl'; $output .= ''."\n". ''."\n". ''."\n". @@ -4499,27 +4611,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(\%numprefab,$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') { @@ -4564,7 +4738,7 @@ 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('
'. '
'.&mt('Course Content').''); if (keys(%ordered)) { @@ -4584,6 +4758,11 @@ sub print_textbook_form { ''. &mt('Copy one of your courses').''.(' 'x2).' '); } + if (keys(%domcloneable)) { + $r->print(''.(' 'x2).' '); + } $r->print(''); @@ -4645,90 +4824,39 @@ sub print_textbook_form { # # Table of user's current courses (owner and/or course coordinator) # + my %lt = &clone_text(); if (keys(%cloneable)) { - my %lt = &clone_text(); $r->print(''); + &clone_selection_table($dom,'owned',\%cloneable). + '

'.$lt{'ncd'}. + '

'. + ''. + '

'); + } +# +# Table of other cloneable courses from user's domain (exclude own courses) +# + if (keys(%domcloneable)) { + $r->print(''); } + # # End of content selector # - if (keys(%cloneable) || keys(%ordered)) { + if (keys(%cloneable) || keys(%domcloneable) || keys(%ordered)) { $r->print('
'); } @@ -4759,11 +4887,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'}); @@ -4786,6 +4909,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(). + ''. + ''.$namestr.''. + &Apache::loncommon::end_data_table_row(); + } + } + } + if ($output) { + return &Apache::loncommon::start_data_table(). + &Apache::loncommon::start_data_table_header_row(). + ''.&mt('Title').''. + ''.&mt('Owner/co-owner(s)').''. + &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); @@ -4811,6 +5015,8 @@ sub process_textbook_request { $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) { @@ -4828,11 +5034,7 @@ sub process_textbook_request { undef($clonedom); } } - my $js = &processing_javascript(); - my $loaditems = { - onload => 'javascript:hideProcessing();', - }; - $r->print(&header('Course Creation',$js,$loaditems)); + $r->print(&header('Course Creation')); if (ref($can_request) eq 'HASH') { unless ((scalar(keys(%{$can_request})) == 1) && ($can_request->{'textbook'})) { @@ -4866,34 +5068,61 @@ 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} = ''; + } + } elsif (($reqtype eq 'textbook') || ($reqtype eq 'template')) { + $details->{datemode} = 'delete'; + $details->{dateshift} = ''; + } + if ($details->{dateshift} ne '') { + $details->{dateshift} =~ s/[^\d\.]+//g; + } + } else { + $details->{datemode} = ''; + $details->{dateshift} = ''; } my $lonhost = $r->dir_config('lonHostID'); $r->rflush(); - my ($result,$output) = &process_request($r,$lonhost,$dom,$cnum,$crstype,$now,$details,'', - $req_notifylist,[],$domconfig); + 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('

'.&mt('Create another course').'

'); + unless ($customized) { + $r->print('

'.&mt('Create another course').'

'); + } } &endContentScreen($r); $r->print(&Apache::loncommon::end_page()); } sub textbook_request_javascript { - my ($numprefab,$numcurrent) = @_; + my ($numprefab,$numcurrent,$numcolleague,$customvalidationjs) = @_; return unless (ref($numprefab) eq 'HASH'); - return if (!$numprefab->{'textbooks'} && !$numprefab->{'templates'} && !$numcurrent); + 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.', - title => 'Please enter a course title.', + 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.', ); &js_escape(\%js_lt); return <<"ENDSCRIPT"; @@ -4902,7 +5131,7 @@ function cloneChoice() { var radioLength = document.requestcourse.cloning.length; if (radioLength == undefined) { var val = document.requestcourse.cloning.value; - if ((val == 'textbook') || (val == 'template') || (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'; @@ -4914,7 +5143,7 @@ function cloneChoice() { } else { for (var i=0; i{'textbooks'}; var numtemplate = $numprefab->{'templates'}; var numcurrent = $numcurrent; + var numcolleague = $numcolleague; if (numbook > 0) { uncheckRadio('textbook'); } @@ -4964,6 +5197,9 @@ function uncheckAllRadio() { if (numcurrent > 0) { uncheckRadio('existing'); } + if (numcolleague > 0) { + uncheckRadio('colleague'); + } return; } @@ -4991,7 +5227,7 @@ function validTextbookReq() { } } var group; - if ((cloneChoice == 'textbook') || (cloneChoice == 'template') || (cloneChoice == 'existing')) { + if ((cloneChoice == 'textbook') || (cloneChoice == 'template') || (cloneChoice == 'existing') || (cloneChoice == 'colleague')) { var group; if (cloneChoice == 'textbook') { group = document.getElementsByName('book'); @@ -4999,7 +5235,11 @@ function validTextbookReq() { if (cloneChoice == 'template') { group = document.getElementsByName('template'); } else { - group = document.getElementsByName('owned'); + if (cloneChoice == 'existing') { + group = document.getElementsByName('owned'); + } else { + group = document.getElementsByName('colleague'); + } } } var groupLength = group.length; @@ -5023,7 +5263,11 @@ function validTextbookReq() { if (cloneChoice == 'template') { alert("$js_lt{'template'}"); } else { - alert("$js_lt{'existing'}"); + if (cloneChoice == 'existing') { + alert("$js_lt{'existing'}"); + } else { + alert("$js_lt{'colleague'}"); + } } } return false; @@ -5034,6 +5278,7 @@ function validTextbookReq() { alert("$js_lt{'title'}"); return false; } + $customvalidationjs return true; }