--- loncom/interface/lonparmset.pm	2021/08/12 20:43:26	1.602
+++ loncom/interface/lonparmset.pm	2022/04/28 15:30:34	1.607
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.602 2021/08/12 20:43:26 raeburn Exp $
+# $Id: lonparmset.pm,v 1.607 2022/04/28 15:30:34 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1736,13 +1736,11 @@ sub print_row {
         my ($domltistr,$crsltistr);
         my %lti =
             &Apache::lonnet::get_domain_lti($env{'course.'.$env{'request.course.id'}.'.domain'},
-                                            'provider');
+                                            'linkprot');
         if (keys(%lti)) {
             foreach my $item (sort { $a <=> $b }  (keys(%lti))) {
-                if (ref($lti{$item}) eq 'HASH') {
-                    unless ($lti{$item}{'requser'}) {
-                        $domltistr .= $item.':'.&escape(&escape($lti{$item}{'consumer'})).',';
-                    }
+                if (($item =~ /^\d+$/) && (ref($lti{$item}) eq 'HASH')) {
+                    $domltistr .= $item.':'.&escape(&escape($lti{$item}{'name'})).',';
                 }
             }
             $domltistr =~ s/,$//;
@@ -2089,11 +2087,22 @@ sub extractResourceInformation {
     my $uris=shift;
     my $keyorder=shift;
     my $defkeytype=shift;
+    my $pssymb=shift;
 
     my $keyordercnt=100;
 
     my $navmap = Apache::lonnavmaps::navmap->new();
-    my @allres=$navmap->retrieveResources(undef,undef,1,undef,1);
+    return unless(ref($navmap));
+    my @allres;
+    if ($pssymb ne '') {
+        my $res = $navmap->getBySymb($pssymb);
+        if (ref($res)) {
+            @allres = ($res);
+        }
+    }
+    if (!@allres) { 
+        @allres=$navmap->retrieveResources(undef,undef,1,undef,1);
+    }
     foreach my $resource (@allres) {
         my $id=$resource->id();
         my ($mapid,$resid)=split(/\./,$id);
@@ -2217,7 +2226,7 @@ sub isdateparm {
 
 sub is_specialstring {
     my $type=shift;
-    return (($type=~/^string_/) && (($type ne 'string_yesno')));
+    return (($type=~/^string_/) && ($type ne 'string_yesno'));
 }
 
 # Prints the HTML and Javascript to select parameters, with various shortcuts.
@@ -3366,7 +3375,7 @@ sub assessparms {
 # --------------------------------------------------------- Get all assessments
     &extractResourceInformation(\@ids, \%typep,\%keyp, \%allparms, \%allparts, \%allmaps,
                 \%mapp, \%symbp,\%maptitles,\%uris,
-                \%keyorder);
+                \%keyorder,undef,$pssymb);
 
     %allmaps_inverted = reverse(%allmaps);
 
@@ -3383,6 +3392,7 @@ sub assessparms {
         my $chome = $env{'course.'.$env{'request.course.id'}.'.home'};
         my ($got_chostname,$chostname,$cmajor,$cminor);
         my $totalstored = 0;
+        my $totalskippeduser = 0;
         my $now = time;
         for (my $i=0;$i<=$#markers;$i++) {
             my ($needsrelease,$needsnewer,$name,$namematch);
@@ -3391,6 +3401,11 @@ sub assessparms {
             }
             if ($markers[$i] =~ /\&(8|7|6|5)$/) {
                 next if ($noeditgrp);
+            } elsif ($markers[$i] =~ /\&(4|3|2|1)$/) {
+                if ($uname eq '') {
+                    $totalskippeduser ++;
+                    next;
+                }
             }
             if ($markers[$i] =~ /\&(17|11|7|3)$/) {
                 $namematch = 'maplevelrecurse';
@@ -3529,9 +3544,27 @@ sub assessparms {
 # ---------------------------------------------------------------- Done storing
         if ($totalstored) {
             $message.='<p class="LC_warning">'
+                     .&mt('Changes for [quant,_1,parameter] saved.',$totalstored)
+                     .'<br />'
                      .&mt('Changes can take up to 10 minutes before being active for all students.')
                      .&Apache::loncommon::help_open_topic('Caching')
                      .'</p>';
+        } else {
+            $message.='<p class="LC_info">'.&mt('No parameter changes saved.').'</p>';
+        }
+        if ($totalskippeduser) {
+            $message .= '<p class="LC_warning">';
+            if ($uhome eq 'no_host') {
+                $message .= &mt('Changes for [quant,_1,user-specific parameter] not saved because the username or ID was invalid.',
+                                $totalskippeduser);
+            } elsif ($env{'form.userroles'} eq 'any') {
+                $message .= &mt('Changes for [quant,_1,user-specific parameter] not saved because the user does not have a course role.',
+                                $totalskippeduser);
+            } else {
+                $message .= &mt('Changes for [quant,_1,user-specific parameter] not saved because the user is not a student.',
+                                $totalskippeduser);
+            }
+            $message .= '</p>';
         }
     }
 
@@ -3562,13 +3595,20 @@ sub assessparms {
 
     # ----- Start Parameter Selection
 
-    # Hide parm selection?
+    # Hide parm selection and possibly table?
+    my ($tablejs,$tabledivsty);
+    if (((($env{'form.uname'} ne '') || ($env{'form.id'} ne '')) && ($uname eq '')) &&
+        ($env{'form.dis'}) && ($pssymb eq '')) {
+        $tablejs = 'document.getElementById('."'parmtable'".').style.display = "";';
+        $tabledivsty = ' style="display:none"';
+    }
     $r->print(<<ENDPARMSELSCRIPT);
 <script type="text/javascript">
 // <![CDATA[
 function parmsel_show() {
     document.getElementById('parmsel').style.display = "";
     document.getElementById('parmsellink').style.display = "none";
+    $tablejs
 }
 // ]]>
 </script>
@@ -3675,6 +3715,7 @@ ENDPARMSELSCRIPT
         if ($parm_permission->{'edit'}) {
             undef($readonly); 
         }
+        $r->print('<div id="parmtable"'.$tabledivsty.'>');
 
         if ($parmlev eq 'full') {
 #
@@ -3891,7 +3932,7 @@ ENDTABLEHEADFOUR
 
 #-------------------------------------------- for each map, gather information
             my $mapid;
-            foreach $mapid (sort {$maplist{$a} cmp $maplist{$b}} keys(%maplist)) {
+            foreach $mapid (sort { $a <=> $b } keys(%maplist)) {
                 my $maptitle = $maplist{$mapid};
 
 #-----------------------  loop through ids and get all parameter types for map
@@ -4108,6 +4149,7 @@ ENDMAPONE
                      .'</center>'
             );
         } # end of $parmlev eq general
+        $r->print('</div>');
     }
     $r->print('</form>');
     if ($numreclinks) {
@@ -5100,12 +5142,10 @@ sub string_deeplink_selector {
     }
     my %lti =
         &Apache::lonnet::get_domain_lti($env{'course.'.$env{'request.course.id'}.'.domain'},
-                                        'provider');
+                                        'linkprot');
     foreach my $item (keys(%lti)) {
-        if (ref($lti{$item}) eq 'HASH') {
-            unless ($lti{$item}{'requser'}) {
-                $domlti{$item} = $lti{$item}{'consumer'};
-            }
+        if (($item =~ /^\d+$/) && (ref($lti{$item}) eq 'HASH')) {
+            $domlti{$item} = $lti{$item}{'name'};
         }
     }
     if ($env{'course.'.$env{'request.course.id'}.'.menucollections'}) {
@@ -5886,7 +5926,7 @@ ENDOVER
 
     &extractResourceInformation(\@ids, \%typep,\%keyp, \%allparms, \%allparts, \%allmaps,
                 \%mapp, \%symbp,\%maptitles,\%uris,
-                \%keyorder,\%defkeytype);
+                \%keyorder,\%defkeytype,$pssymb);
 
     if (grep {$_ eq 'all'} (@psprt)) {
         @psprt = keys(%allparts);