--- loncom/interface/loncoursequeueadmin.pm	2021/06/20 18:37:35	1.52.2.3.2.4
+++ loncom/interface/loncoursequeueadmin.pm	2020/08/21 21:59:20	1.60
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Utilities to administer domain course requests and course self-enroll requests
 #
-# $Id: loncoursequeueadmin.pm,v 1.52.2.3.2.4 2021/06/20 18:37:35 raeburn Exp $
+# $Id: loncoursequeueadmin.pm,v 1.60 2020/08/21 21:59:20 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -506,7 +506,7 @@ sub build_queue_display {
     my %crstypes;
     my $output =  &Apache::loncommon::start_data_table().
                   &Apache::loncommon::start_data_table_header_row();
-    unless (($context eq 'pending') || ($context eq 'displaypending') || ($context eq 'helpdesk')) {
+    unless (($context eq 'pending') || ($context eq 'displaypending') || ($context eq 'helpdesk')) { 
         $output .= '<th>'.&mt('Action').'</th>';
     }
     $output .= '<th>'.&mt('Requestor').'</th>';
@@ -528,6 +528,7 @@ sub build_queue_display {
                         unofficial => 'Unofficial course',
                         community  => 'Community',
                         textbook   => 'Textbook course',
+                        placement  => 'Placement test',
                     );
         $output .= '<th>'.&mt('Type').'</th>'.
                    '<th>'.&mt('Date requested').'</th>'.
@@ -609,7 +610,7 @@ sub build_queue_display {
                 } elsif ($context eq 'requestusername') {
                     $row .= '<td>'.$showtime.'</td>'."\n".
                             '<td>'.$detailslink.'</td>'."\n";
-                } else {
+                } else { 
                     if ($context eq 'pending' || $context eq 'displaypending' || $context eq 'stillpending') {
                         $row .= '<td>'.$instcode.'</td>'."\n";
                     } else {
@@ -1646,7 +1647,7 @@ sub course_creation {
         $owneremail = $emails{$email};
         last if ($owneremail ne '');
     }
-    my %reqdetails = &build_batchcreatehash($dom,$cnum,$context,$details,$owneremail,$domdefs);
+    my %reqdetails = &build_batchcreatehash($dom,$context,$details,$owneremail,$domdefs);
     my $cid = &LONCAPA::batchcreatecourse::build_course($dom,$cnum,'requestcourses',
                   \%reqdetails,$longroles,$logmsg,$clonemsg,$newusermsg,$addresult,
                   $enrollcount,$output,$keysmsg,$ownerdom,$ownername,$cnum,$crstype,
@@ -1668,7 +1669,7 @@ sub course_creation {
 }
 
 sub build_batchcreatehash {
-    my ($dom,$cnum,$context,$details,$owneremail,$domdefs) = @_;
+    my ($dom,$context,$details,$owneremail,$domdefs) = @_;
     my %batchhash;
     my @items = qw{owner domain coursehome clonecrs clonedom datemode dateshift tinyurls enrollstart enrollend accessstart accessend sections users uniquecode};
     if ((ref($details) eq 'HASH') && (ref($domdefs) eq 'HASH')) {
@@ -1680,14 +1681,7 @@ sub build_batchcreatehash {
         if (ref($details->{'crosslists'}) eq 'HASH') {
             foreach my $key (keys(%{$details->{'crosslists'}})) {
                 if (ref($details->{'crosslists'}->{$key}) eq 'HASH') {
-                    my $instsec = $details->{crosslists}->{$key}->{instsec};
-                    $batchhash{'crosslists'}{$key}{'inst'} = $details->{crosslists}->{$key}->{instcode};
-                    my $crskey = $cnum.':'.$batchhash{'crosslists'}{$key}{'inst'};
-                    my %formatted = &Apache::lonnet::auto_instsec_reformat($dom,'clutter',
-                                                                           {$crskey => [$instsec]});
-                    if (ref($formatted{$crskey}) eq 'ARRAY') {
-                        $batchhash{'crosslists'}{$key}{'inst'} .= $formatted{$crskey}->[0];
-                    }
+                    $batchhash{'crosslists'}{$key}{'inst'} = $details->{crosslists}->{$key}->{instcode}.$details->{crosslists}->{$key}->{instsec};
                     $batchhash{'crosslists'}{$key}{'loncapa'} = $details->{crosslists}->{$key}->{loncapa};
                 }
             }
@@ -1704,6 +1698,8 @@ sub build_batchcreatehash {
         $batchhash{'authparam'} = $domdefs->{'auth_arg_def'};
         if ($details->{'crstype'} eq 'community') {
             $batchhash{'crstype'} = 'Community';
+        } elsif ($details->{'crstype'} eq 'placement') {
+            $batchhash{'crstype'} = 'Placement';
         } else {
             if ($details->{'crstype'} eq 'textbook') {
                 if ($details->{'clonecrs'} && $details->{'clonedom'}) {
@@ -2119,7 +2115,7 @@ sub process_official_reqs {
                     my ($result,$postprocess) = 
                         &course_creation($dom,$cnum,'domain',$history{'details'},\$logmsg,$clonemsg,\$newusermsg,
                                          \$addresult,\$enrollcount,\$response,\$keysmsg,\%domdefs,\%longroles,
-                                         \$code,\%customitems,$context,$user_lh);    
+                                         \$code,\%customitems,$context,$user_lh);
                     if ($result eq 'created') {
                         $disposition = 'created';
                         $reqstatus = 'created';