--- loncom/interface/lonpickcourse.pm	2014/04/25 17:56:43	1.114
+++ loncom/interface/lonpickcourse.pm	2017/01/03 17:47:57	1.124
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Pick a course
 #
-# $Id: lonpickcourse.pm,v 1.114 2014/04/25 17:56:43 bisitz Exp $
+# $Id: lonpickcourse.pm,v 1.124 2017/01/03 17:47:57 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -37,24 +37,45 @@ use Apache::lonnet;
 use Apache::lonlocal;
 use Apache::longroup;
 use LONCAPA qw(:DEFAULT :match);
+use JSON::DWIW;
 
 sub handler {
     my $r = shift;
+    if ($env{'form.context'} eq 'adhoc') {
+        &Apache::loncommon::content_type($r,'application/json');
+        $r->send_http_header;
+        my ($possroles,$description) = &Apache::lonnet::get_my_adhocroles($env{'form.cid'});
+        if ((ref($possroles) eq 'ARRAY') && (ref($description) eq 'HASH')) {
+            my $response = [];
+            if (@{$possroles}) {
+                foreach my $role (@{$possroles}) {
+                    push(@{$response},
+                                      { name => $role,
+                                        desc => $description->{$role},
+                                      });
+                }
+            }
+            $r->print(JSON::DWIW->to_json({roles => $response}));
+        }
+        return OK;
+    }
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
     return OK if $r->header_only;
-
+    
 # ------------------------------------------------------------ Print the screen
 
     # Get parameters from query string
     &Apache::loncommon::get_unprocessed_cgi
         ($ENV{'QUERY_STRING'},['domainfilter','form','cnumelement',
 			       'cdomelement','cnameelement','roleelement',
-                               'multiple','type','setroles','fixeddom','cloner']);
+                               'multiple','type','setroles','fixeddom','cloner',
+                               'crscode','crsdom']);
     my ($type,$title,$jscript,$multelement,$multiple,$roleelement,$typeelement,
-        $lastaction,$autosubmit,$submitopener,$cloneruname,$clonerudom);
+        $lastaction,$autosubmit,$submitopener,$cloneruname,$clonerudom,$crscode,
+        $crsdom,$rolechooser);
 
-    # Get course type - Course or Community.
+    # Get course type - Course, Community or Placement.
     $type = $env{'form.type'};
     if (!defined($env{'form.type'})) {
         $type = 'Course';
@@ -68,12 +89,31 @@ sub handler {
         $title = 'Selecting '.$type.'(s)';
     }
 
-    # if called when a DC is selecting a course 
-    my $roledom = $env{'form.roleelement'};
+    # if called when a DC or DH is selecting a course 
+    my ($roledom,$rolename) = split(/:/,$env{'form.roleelement'});
     if ($roledom) {
-        $roleelement = '<input type="hidden" name="roleelement" value="'.$roledom.'" />';
+        $roleelement = '<input type="hidden" name="roleelement" value="'.$env{'form.roleelement'}.'" />';
         $submitopener = &processpick();
-        $autosubmit = 'process_pick("'.$roledom.'")';
+        $autosubmit = 'process_pick("'.$roledom.'","'.$rolename.'")';
+        if ($rolename eq 'dh') {
+            my %lt = &Apache::lonlocal::texthash(
+                     title    => 'Ad hoc role selection',
+                     preamble => 'Please choose an ad hoc role in the course.',
+                     cancel   => 'Click "OK" to enter the course, or "Cancel" to choose a different course.',
+            );
+
+            $rolechooser = <<"END";
+<div id="LC_adhocrole_chooser" title="$lt{'title'}">
+  <p>$lt{'preamble'}</p>
+  <form name="LChelpdeskadhoc" id="LChelpdeskpicker" action="">
+    <div id="LC_choose_adhoc">
+    </div>
+    <input type="submit" tabindex="-1" style="position:absolute; top:-1000px" />
+  </form>
+  <p>$lt{'cancel'}</p>
+</div>
+END
+        }
     }
     if ($env{'form.typeelement'} ne '') {
         $typeelement = '<input type="hidden" name="typeelement" value="'.$env{'form.typeelement'}.'" />';
@@ -82,12 +122,16 @@ sub handler {
     # if called when a DC is creating a course for another user.
     if ($env{'form.form'} eq 'ccrs') {
         ($cloneruname,$clonerudom) = ($env{'form.cloner'} =~ /^($match_username):($match_domain)$/);
+        $crscode = $env{'form.crscode'};
+        $crsdom = $env{'request.role.domain'};
     }
 
     # if called when requesting a course
     if ($env{'form.form'} eq 'requestcrs') {
         $cloneruname = $env{'user.name'};
         $clonerudom =  $env{'user.domain'};
+        $crscode = $env{'form.crscode'};
+        $crsdom = $env{'form.crsdom'};
     }
 
     my $onlyown = 0;
@@ -105,7 +149,17 @@ sub handler {
 
     if ((($env{'form.form'} eq 'cu') || ($env{'form.form'} eq 'studentform')) && 
         ($env{'form.pickedcourse'})) {
-        $loaditem{'onload'} .= 'setDefaultCredits();setRoles();setSections();';
+        if ($type ne 'Community') {
+            my %coursedescription =
+                &Apache::lonnet::coursedescription($env{'form.pickedcourse'},
+                                                   {'one_time' => '1'});
+            my $cdom = $coursedescription{'domain'};
+            my %domdefs = &Apache::lonnet::get_domain_defaults($cdom);
+            if (($domdefs{'officialcredits'} || $domdefs{'unofficialcredits'} || $domdefs{'textbookcredits'})) {
+                $loaditem{'onload'} .= 'setDefaultCredits();';
+            }
+        }
+        $loaditem{'onload'} .= 'setRoles();setSections();';
     }
     if ((($env{'form.gosearch'}) && ($env{'form.updater'} eq '')) && (!$onlyown)) {
         $loaditem{'onload'} .=  'hideSearching(); ';
@@ -134,7 +188,8 @@ sub handler {
     # print javascript functions for choosing a course 
     if ((($env{'form.gosearch'}) && ($env{'form.updater'} eq '')) || 
         $onlyown) {
-        $r->print(&gochoose_javascript($type,$multiple,$autosubmit,$lastaction));
+        $r->print(&gochoose_javascript($type,$multiple,$autosubmit,$lastaction,
+                                       $rolename,$rolechooser));
     }
     $r->print(&Apache::lonhtmlcommon::scripttag($jscript));
     $r->print($submitopener);
@@ -210,6 +265,12 @@ sub handler {
             if ($coord_cloneable) {
                 $clonetext .= '<input type="hidden" name="cc_clone" value="'.$coord_cloneable.'" />';
             }
+            if ($crscode ne '') {
+                $clonetext .= '<input type="hidden" name="crscode" value="'.$crscode.'" />';
+            }
+            if ($crsdom ne '') {
+                $clonetext .= '<input type="hidden" name="crsdom" value="'.$crsdom.'" />';
+            }
         }
         $r->print(&Apache::loncommon::build_filters($filterlist,$type,$roleelement,$multelement,
                                                     $filter,$action,\$numtitles,undef,$cloneruname,
@@ -237,7 +298,8 @@ sub handler {
             my $srchdom = $filter->{'domainfilter'};
             %courses = &Apache::loncommon::search_courses($srchdom,$type,$filter,$numtitles,
                                                           $cloneruname,$clonerudom,$domcloner,
-                                                          \@codetitles,$env{'form.cc_clone'});
+                                                          \@codetitles,$env{'form.cc_clone'},
+                                                          $crsdom,$crscode);
         } else {
             $r->print('<br />');
             my %coursehash = &Apache::loncommon::findallcourses();
@@ -252,7 +314,7 @@ sub handler {
                            '<b>'.$filter->{'persondomfilter'}.'</b>').'</span>');
         } else {
             &display_matched_courses($r,$type,$multiple,$action,$showroles,$cloneruname,
-                                     $clonerudom,%courses);
+                                     $clonerudom,$crsdom,$crscode,%courses);
         }
     }
     $r->print(&Apache::loncommon::end_page());
@@ -266,7 +328,7 @@ sub processpick {
     }
     my $process_pick = <<"ENDONE";
 <script type="text/javascript">
-function process_pick(dom) {
+function process_pick(dom,rolename) {
     var pickedCourse=opener.document.$openerform.$env{'form.cnumelement'}.value;
     var pickedDomain=opener.document.$openerform.$env{'form.cdomelement'}.value;
     var okDomain = 0;
@@ -275,18 +337,30 @@ ENDONE
         $process_pick .= <<"ENDTWO";
     if (pickedDomain == dom) {
         if (pickedCourse != '') {
-            var ccrole = "cc";
-            var pickedType = "$env{'form.type'}";
-            if (pickedType == "Community") {
-                ccrole = "co";
-            }
-            var courseTarget = ccrole+"./"+pickedDomain+"/"+pickedCourse
-            opener.document.title='Role selected. Please stand by.';
-            opener.status='Role selected. Please stand by.';
-            opener.document.rolechoice.newrole.value=courseTarget
-            opener.document.rolechoice.submit();
+            var courseTarget; 
+            if (rolename == 'cc') {
+                var ccrole = "cc";
+                var pickedType = "$env{'form.type'}";
+                if (pickedType == "Community") {
+                    ccrole = "co";
+                }
+                courseTarget = ccrole+"./"+pickedDomain+"/"+pickedCourse;
+            } else {
+                if (!/\\W/.test(rolename)) {
+                    courseTarget = "cr/"+pickedDomain+"/"+pickedDomain+"-domainconfig/"+rolename+"./"+pickedDomain+"/"+pickedCourse;
+                }
+            }
+            if ((courseTarget != '') && (courseTarget != undefined)) { 
+                opener.document.title='Role selected. Please stand by.';
+                opener.status='Role selected. Please stand by.';
+                opener.document.rolechoice.newrole.value=courseTarget;
+                opener.document.rolechoice.submit();
+            } else {
+                alert("Invalid role selection");
+                return;
+            }
         }
-    } 
+    }
     else {
         alert("You may only use this screen to select courses in the current domain: "+dom+"\\nPlease return to the roles page window and click the 'Select Course' link for domain: "+pickedDomain+",\\n if you are a Domain Coordinator in that domain, and wish to become a Course Coordinator in a course in the domain");
     }
@@ -361,7 +435,7 @@ function setDefaultCredits() {
 }
 
 sub display_matched_courses {
-    my ($r,$type,$multiple,$action,$showroles,$cloneruname,$clonerudom,%courses) = @_;
+    my ($r,$type,$multiple,$action,$showroles,$cloneruname,$clonerudom,$crsdom,$crscode,%courses) = @_;
     if ($env{'form.form'} eq 'portform') {
         $action = '/adm/portfolio';
     }
@@ -376,31 +450,83 @@ sub display_matched_courses {
             my $cctitle = &Apache::lonnet::plaintext($ccrole,$type);
             my $dctitle = &Apache::lonnet::plaintext('dc');
             my $ccrolechk = ' ';
+            my $possrole;
             my $menuchk = ' checked="checked" ';
             $r->print(
                 '<div class="LC_left_float">'
                .'<fieldset>'
-               .'<legend>'.&mt('Pick action').'</legend>'
-               .'<span class="LC_nobreak"><label>'
-               .'<input type="radio" name="phase" value="ccrole"'.$ccrolechk.'/>'
-               .'&nbsp;');
-            if ($type eq 'Community') {
-                $r->print(&mt('Enter the community with the role of [_1].',$cctitle));
-            } else {
-                $r->print(&mt('Enter the course with the role of [_1].',$cctitle));
+               .'<legend>'.&mt('Pick action').'</legend>');
+            my $roleradio = '<span class="LC_nobreak"><label>'.
+                            '<input type="radio" name="phase" value="adhocrole"'.$ccrolechk.'/>'.'&nbsp;';
+            if (&Apache::lonnet::allowed('ccc',$crsdom)) {
+                $possrole = 1;
+                $r->print($roleradio);
+                if ($type eq 'Community') {
+                    $r->print(&mt('Enter the community with the role of [_1].',$cctitle));
+                } elsif ($type eq 'Placement') {
+                    $r->print(&mt('Enter the placement test with the role of [_1].',$cctitle));
+                } else {
+                    $r->print(&mt('Enter the course with the role of [_1].',$cctitle));
+                }
+            } elsif (&Apache::lonnet::allowed('rar',$crsdom)) {
+                my %adhocroles = &Apache::lonnet::userenvironment($env{'user.domain'},$env{'user.name'},
+                                                                  'adhocroles.'.$crsdom);
+                if ($adhocroles{'adhocroles.'.$crsdom} ne '') {
+                    $possrole = 1;
+                    $r->print($roleradio);
+                    my @adhoc = split(/,/,$adhocroles{'adhocroles.'.$crsdom});
+                    if (@adhoc > 1) {
+                        my %adhochash;
+                        map { $adhochash{$_} = $_; } @adhoc; 
+                        my $selector = &Apache::loncommon::select_form($adhoc[0],'adhocrole',\%adhochash);
+                        if ($type eq 'Community') {
+                            $r->print(&mt('Enter the community with one of the available ad hoc roles: [_1].',
+                                          $selector)); 
+                        } elsif ($type eq 'Placement') {
+                            $r->print(&mt('Enter the placement test with one of the available ad hoc roles: [_1].',
+                                          $selector));
+                        } else {
+                            $r->print(&mt('Enter the course with one of the available ad hoc roles: [_1].',
+                                          $selector));
+                        }
+                    } else {
+                        if ($type eq 'Community') {
+                            $r->print(&mt('Enter the community with the ad hoc role of: [_1]',$adhoc[0]));
+                        } elsif ($type eq 'Placement') {
+                            $r->print(&mt('Enter the placement test with the ad hoc role of: [_1]',$adhoc[0]));
+                        } else {
+                            $r->print(&mt('Enter the course with the ad hoc role of: [_1]',$adhoc[0]));
+                        }
+                        $r->print('<input type="hidden" name="adhocrole" value="'.$adhoc[0].'" />');
+                    }
+                }
             }
-            $r->print('</label></span><br />'
-               .'<span class="LC_nobreak"><label>'
-               .'<input type="radio" name="phase" value="menu"'.$menuchk.'/>&nbsp;');
-            if ($type eq 'Community') {
-                $r->print(&mt('View or modify community settings which only a [_1] may modify.',$dctitle));
-            } else {
-                $r->print(&mt('View or modify course settings which only a [_1] may modify.',$dctitle));
+            if ($possrole) { 
+                $r->print('</label></span><br />');
+            }
+            $r->print('<span class="LC_nobreak"><label>'
+                     .'<input type="radio" name="phase" value="menu"'.$menuchk.'/>&nbsp;');
+            if (&Apache::lonnet::allowed('ccc',$crsdom)) {
+                if ($type eq 'Community') {
+                    $r->print(&mt('View or modify community settings which only a [_1] may modify.',$dctitle));
+                } elsif ($type eq 'Placement') {
+                    $r->print(&mt('View or modify placement test settings which only a [_1] may modify.',$dctitle));
+                } else {
+                    $r->print(&mt('View or modify course settings which only a [_1] may modify.',$dctitle));
+                }
+            } elsif (&Apache::lonnet::allowed('rar',$crsdom)) {
+                if ($type eq 'Community') {
+                    $r->print(&mt('View community settings which only a [_1] may modify.',$dctitle));
+                } elsif ($type eq 'Placement') {
+                    $r->print(&mt('View placement test settings which only a [_1] may modify.',$dctitle));
+                } else {
+                    $r->print(&mt('View course settings which only a [_1] may modify.',$dctitle));
+                }
             }
             $r->print('</label></span>'
-               .'</fieldset></div>'
-               .'<br clear="all" />'
-            );
+                     .'</fieldset></div>'
+                     .'<br clear="all" />'
+                     );
         }
     }
     my %by_descrip;
@@ -435,7 +561,7 @@ sub display_matched_courses {
         $r->print('<th>'.&mt('Select').'</th>'
                  .'<th>'.$titlehdr.'</th>'
                  .'<th>'.&mt('Domain').'</th>');
-        unless ($type eq 'Community') {
+        unless (($type eq 'Community') || ($type eq 'Placement')) {
             $r->print('<th>'.&mt('Course Code').'</th>');
         }
         $r->print('<th>'.&mt('Owner/Co-owner(s)').'</th>');
@@ -454,6 +580,7 @@ sub display_matched_courses {
             map {$cc_cloneable{$_} = 1;} split('&',$coord_cloneable);
         }
     }
+    my (%gotdomdefaults,%gotcodedefaults);
     foreach my $description (sort { lc($a) cmp lc($b) } (keys(%by_descrip))) {
         foreach my $course (@{$by_descrip{$description}}) {
             $r->print(&Apache::loncommon::start_data_table_row());
@@ -479,7 +606,7 @@ sub display_matched_courses {
                     }
                     unless ($canclone) {
                         my $cloners = $courses{$course}{'cloners'};
-                        if ($cloners ne '') { 
+                        if ($cloners ne '') {
                             my @cloneable = split(',',$cloners);
                             if (grep(/^\*$/,@cloneable)) {
                                 $canclone = 1;
@@ -490,6 +617,80 @@ sub display_matched_courses {
                             if (grep(/^\Q$cloneruname\E:\Q$clonerudom\E$/,@cloneable)) {
                                 $canclone = 1;
                             }
+                            unless ($canclone) {
+                                if (($instcode) && ($crscode) && ($cdom eq $crsdom)) {
+                                    foreach my $cloner (@cloneable) {
+                                        if (($cloner ne '*') && ($cloner !~ /^\*\:$match_domain$/) &&
+                                            ($cloner !~ /^$match_username\:$match_domain$/) && ($cloner ne '')) {
+                                            if ($cloner =~ /\=/) {
+                                                my (%codedefaults,@code_order);
+                                                if (ref($gotcodedefaults{$cdom}) eq 'HASH') {
+                                                    if (ref($gotcodedefaults{$cdom}{'defaults'}) eq 'HASH') {
+                                                        %codedefaults = %{$gotcodedefaults{$cdom}{'defaults'}};
+                                                    }
+                                                    if (ref($gotcodedefaults{$cdom}{'order'}) eq 'ARRAY') {
+                                                        @code_order = @{$gotcodedefaults{$cdom}{'order'}};
+                                                    }
+                                                } else {
+                                                    &Apache::lonnet::auto_instcode_defaults($cdom,
+                                                                                            \%codedefaults,
+                                                                                            \@code_order);
+                                                    $gotcodedefaults{$cdom}{'defaults'} = \%codedefaults;
+                                                    $gotcodedefaults{$cdom}{'order'} = \@code_order;
+                                                }
+                                                if (@code_order > 0) {
+                                                    if (&Apache::lonnet::check_instcode_cloning(\%codedefaults,\@code_order,
+                                                                                                $cloner,$instcode,$crscode)) {
+                                                        $canclone = 1;
+                                                        last;
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        } else {
+                            my %domdefs;
+                            if (ref($gotdomdefaults{$cdom}) eq 'HASH') {
+                                %domdefs = %{$gotdomdefaults{$cdom}};
+                            } else {
+                                %domdefs = &Apache::lonnet::get_domain_defaults($cdom);
+                                $gotdomdefaults{$cdom} = \%domdefs;
+                            }
+                            if ($domdefs{'canclone'}) {
+                                unless ($domdefs{'canclone'} eq 'none') {
+                                    if ($domdefs{'canclone'} eq 'domain') {
+                                        if ($clonerudom eq $cdom) {
+                                            $canclone = 1;
+                                        }
+                                    } elsif (($instcode) && ($crscode) &&
+                                             ($cdom eq $crsdom)) {
+                                        my (%codedefaults,@code_order); 
+                                        if (ref($gotcodedefaults{$cdom}) eq 'HASH') {
+                                            if (ref($gotcodedefaults{$cdom}{'defaults'}) eq 'HASH') {
+                                                %codedefaults = %{$gotcodedefaults{$cdom}{'defaults'}};
+                                            }
+                                            if (ref($gotcodedefaults{$cdom}{'order'}) eq 'ARRAY') {
+                                                @code_order = @{$gotcodedefaults{$cdom}{'order'}};
+                                            }
+                                        } else {
+                                            &Apache::lonnet::auto_instcode_defaults($cdom,
+                                                                                    \%codedefaults,
+                                                                                    \@code_order);
+                                            $gotcodedefaults{$cdom}{'defaults'} = \%codedefaults;
+                                            $gotcodedefaults{$cdom}{'order'} = \@code_order;
+                                        }
+                                        if (@code_order > 0) {
+                                            if (&Apache::lonnet::default_instcode_cloning($cdom,$domdefs{'canclone'},
+                                                                                          $instcode,$crscode,\%codedefaults,
+                                                                                          \@code_order)) {
+                                                $canclone = 1;
+                                            }
+                                        }
+                                    }
+                                }
+                            }
                         }
                     }
                 }
@@ -511,7 +712,7 @@ sub display_matched_courses {
             $r->print(&Apache::lonnet::domain($cdom,'description')?
                       $cdom.' ('.&Apache::lonnet::domain($cdom,'description').')':$cdom);
             $r->print('</td>');
-            unless ($type eq 'Community') { 
+            unless (($type eq 'Community') || ($type eq 'Placement')) { 
                 $r->print('<td>');
                 if ($instcode ne '') {
                     $r->print(&unescape($instcode));
@@ -609,7 +810,7 @@ sub get_coordinator_cloneable {
         my ($cc_clone,$ccrole);
         if ($type eq 'Community') {
             $ccrole = 'co';
-        } elsif ($type eq 'Course') {
+        } else {
             $ccrole = 'cc';
         }
         my %ccroles = &Apache::lonnet::get_my_roles($cloneruname,$clonerudom,
@@ -642,7 +843,7 @@ sub course_chooser {
 }
 
 sub gochoose_javascript {
-    my ($type,$multiple,$autosubmit,$lastaction) = @_;
+    my ($type,$multiple,$autosubmit,$lastaction,$rolename,$rolechooser) = @_;
     my %elements = (
                      'Course' => {
                                  name  => 'coursepick',
@@ -654,10 +855,30 @@ sub gochoose_javascript {
                                  total => 'coursetotal',
                                  list  => 'courselist',
                               },
+                     'Placement' => {
+                                 name  => 'coursepick',
+                                 total => 'coursetotal',
+                                 list  => 'courselist',
+                                 },
                     );
-    my $output = qq|
+
+    my %lt = &Apache::lonlocal::texthash (
+        none => 'You are not eligible to use an ad hoc role for the selected course',
+        ok => 'OK',
+        exit => 'Cancel',       
+    );
+    &js_escape(\%lt);
+
+    my $output;
+    if ($rolechooser) {
+        $output .= qq|
+\$( "#LC_adhocrole_chooser" ).dialog({ autoOpen: false });
+|;
+    }
+    $output .= qq|
 function gochoose(cname,cdom,cdesc) {
     var openerForm = "$env{'form.form'}";
+    var openerRole = "$rolename";
     courseCount = 0;
     var courses = '';
 |;
@@ -733,16 +954,80 @@ ENDNAMECODE
         }
 |;
     }
-    $output .= qq|
+    $output .= <<ENDJS;
     if (openerForm == 'portform') {
         document.courselist.cnum.value = cname;
         document.courselist.cdom.value = cdom;
     }
-    $autosubmit
-    $lastaction
+    if ((openerForm == 'rolechoice') && (openerRole == 'dh')) {
+\$("#LC_choose_adhoc").empty();
+var http = new XMLHttpRequest();
+var url = "/adm/pickcourse";
+var params = "cid="+cdom+"_"+cname+"&context=adhoc";
+http.open("POST", url, true);
+http.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
+http.onreadystatechange = function() {
+    if(http.readyState == 4 && http.status == 200) {
+        var data = \$.parseJSON(http.responseText);
+        var len = data.roles.length;
+        if (len == '' || len == null || len == 0) {
+            alert('$lt{none}');  
+        } else {
+            if (len == 1) {
+                process_pick(cdom,data.roles[0].name);
+                $lastaction;
+            } else {
+                var str = '';
+                for (var i=0; i<data.roles.length; i++) { 
+                    \$("<label><input type='radio' value='"+data.roles[i].name+"' name='LC_get_role' id='LC_get_role_"+i+"' />"+data.roles[i].desc+"</label><span>&nbsp;&nbsp;</span>")
+                    .appendTo("#LC_choose_adhoc");
+                }
+                \$( "#LC_get_role_0").prop("checked", true);
+                \$( "#LC_adhocrole_chooser" ).dialog({ autoOpen: false });
+                \$( "#LC_adhocrole_chooser" ).dialog("open");
+                \$( "#LC_adhocrole_chooser" ).dialog({
+                 height: 400,
+                 width: 500,
+                 modal: true,
+                 resizable: false,
+                 buttons: [
+                       {
+                         text: "$lt{'ok'}",
+                         click: function() {
+                                     var rolename = \$('input[name=LC_get_role]:checked', '#LChelpdeskpicker').val();
+                                     process_pick(cdom,rolename);
+                                     \$("#LC_adhocrole_chooser").dialog( "close" );
+                                     $lastaction;
+                                } 
+                       },
+                       {
+                         text: "$lt{'exit'}",
+                         click: function() {
+                                     \$("#LC_adhocrole_chooser").dialog( "close" );
+                                }
+                       }
+                     ],
+                });
+                \$( "#LC_adhocrole_chooser" ).find( "form" ).on( "submit", function( event ) {
+                   event.preventDefault();
+                   var rolename = \$('input[name=LC_get_role]:checked', '#LChelpdeskpicker').val()
+                   process_pick(cdom,rolename);
+                   \$("#LC_adhocrole_chooser").dialog( "close" );
+                   $lastaction;
+                   });
+            }
+        }
+    }
 }
-|;
-    return &Apache::lonhtmlcommon::scripttag($output);
+http.send(params);
+    } else {
+        $autosubmit
+        $lastaction
+    }
+}
+
+ENDJS
+    return $rolechooser.&Apache::lonhtmlcommon::scripttag($output);
 }
 
 1;
@@ -775,7 +1060,7 @@ Course Activity - how recently was cours
 Course Domain - the domain of the course
 
 =item *
-Type - Course or Community
+Type - Course, Community or Placement
 
 =item *
 Course Institutional Code - the institutional identifier assigned to the course
@@ -828,7 +1113,7 @@ Following selection, and/or submission,
 X<create_user_javascript()>
 B<create_user_javascript($type)>:
 
-Input: 1 - $type  - the course type - Course or Community
+Input: 1 - $type  - the course type - Course, Community, or Placement
 
 Output: 1 - $output - javascript wrapped in E<lt>scriptE<gt>E<lt>/scriptE<gt> tags 
 
@@ -839,9 +1124,9 @@ javascript code for reporting selected s
 
 =item *
 X<display_matched_courses()>
-B<display_matched_courses($r,$type,$multiple,$action,$showroles,$cloneruname,$clonerudom,%courses)>:
+B<display_matched_courses($r,$type,$multiple,$action,$showroles,$cloneruname,$clonerudom,$crsdom,$crscode,%courses)>:
 
-Input: 7 - request object, course type, multiple (0 or 1), form action, whether to show roles (for course personnel filter), username of new course owner, domain of new course owner, hash of courses.
+Input: 8 - request object, course type, multiple (0 or 1), form action, whether to show roles (for course personnel filter), username of new course owner, domain of new course owner, domain of new course, institutional code of new course, hash of courses.
 
 Output: 0
 
@@ -872,9 +1157,9 @@ Side Effects: None
 
 =item *
 X<gochoose_javascript()>
-B<gochoose_javascript($type,$multiple,$autosubmit,$lastaction)>:
+B<gochoose_javascript($type,$multiple,$autosubmit,$lastaction,$rolename)>:
 
-Input: 4 - course type; single (0) or multiple courses (1); in context of DC selecting a CC role in a course: javascript code from &processpick(); final action to take after user chooses course(s):  either close window, or submit form for display of next page etc.
+Input: 5 - course type; single (0) or multiple courses (1); in context of DC selecting a CC role in a course: javascript code from &processpick(); final action to take after user chooses course(s):  either close window, or submit form for display of next page etc.; rolename (e.g., dh) of user's current role.
 
 Output: 1  $output - javascript wrapped in E<lt>scriptE<gt>E<lt>/scriptE<gt> tags